diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
| commit | 731d190fecb1976d845f6bd18768ee528b007232 (patch) | |
| tree | 323c63555256ad7e5faa6a9d3c10f957295d0ce1 /skins/larry/ui.js | |
| parent | 586ed69aa8f9df34076f4e3bb5e1ecf0cfc6581a (diff) | |
| parent | 8763170d224408bb01998d0a3393d2eacfc781ad (diff) | |
Merge branch 'tinymce4'
Conflicts:
program/js/app.js
program/js/editor.js
program/js/tiny_mce/tiny_mce.js
program/steps/utils/spell_html.inc
Diffstat (limited to 'skins/larry/ui.js')
| -rw-r--r-- | skins/larry/ui.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/skins/larry/ui.js b/skins/larry/ui.js index 0e8afc652..391e7ab9d 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -525,19 +525,19 @@ function rcube_mail_ui() w, h, bh, ovflw, btns = 0, minheight = 300, - bh = (form.height() - bottom.position().top); + bh = form.height() - bottom.position().top; ovflw = minheight - bh; btns = ovflw > -100 ? 0 : 40; - bottom.css('height', Math.max(minheight, bh) + 'px'); + bottom.height(Math.max(minheight, bh)); form.css('overflow', ovflw > 0 ? 'auto' : 'hidden'); w = body.parent().width() - 5; - h = body.parent().height() - 16; + h = body.parent().height() - 8; body.width(w).height(h); - $('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px'); - $('#composebody_ifr').width((w+8)+'px').height((h-40)+'px'); - $('#googie_edit_layer').height(h+'px'); + $('#composebodycontainer > div').width(w+8); + $('#composebody_ifr').height(h + 4 - $('div.mce-toolbar').height()); + $('#googie_edit_layer').height(h - 8); // $('#composebodycontainer')[(btns ? 'addClass' : 'removeClass')]('buttons'); // $('#composeformbuttons')[(btns ? 'show' : 'hide')](); @@ -1454,4 +1454,4 @@ rcube_splitter.get_instance = function(id) return rcube_splitter._instances[id]; }; -// @license-end
\ No newline at end of file +// @license-end |