From 421ed1e5458ef8b3947ca4cce45eae7804b41f74 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 27 Oct 2014 17:51:28 +0100
Subject: Fix compose body area size, so scrollbars aren't truncated, unify
 padding

---
 program/js/editor.js                     |  2 +-
 program/js/googiespell.js                | 12 +++++++-----
 program/js/tinymce/roundcube/content.css |  4 +---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'program/js')

diff --git a/program/js/editor.js b/program/js/editor.js
index 0facfd948..26b6927f5 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -40,7 +40,7 @@ function rcube_text_editor(config, id)
       selector: '#' + ($('#' + id).is('.mce_editor') ? id : 'fake-editor-id'),
       theme: 'modern',
       language: config.lang,
-      content_css: 'program/js/tinymce/roundcube/content.css?v1',
+      content_css: 'program/js/tinymce/roundcube/content.css?v2',
       menubar: false,
       statusbar: false,
       toolbar_items_size: 'small',
diff --git a/program/js/googiespell.js b/program/js/googiespell.js
index 707efd165..8c17508dd 100644
--- a/program/js/googiespell.js
+++ b/program/js/googiespell.js
@@ -312,7 +312,9 @@ this.prepare = function(ignore, no_indicator)
     this.ignore = ignore;
     this.hideLangWindow();
 
-    if ($(this.text_area).val() == '' || ignore) {
+    var area = $(this.text_area);
+
+    if (area.val() == '' || ignore) {
         if (!this.custom_no_spelling_error)
             this.flashNoSpellingErrorState();
         else
@@ -321,7 +323,7 @@ this.prepare = function(ignore, no_indicator)
         return;
     }
 
-    this.createEditLayer(this.text_area.offsetWidth, this.text_area.offsetHeight);
+    this.createEditLayer(area.width(), area.height());
     this.createErrorWindow();
     $('body').append(this.error_window);
 
@@ -331,7 +333,7 @@ this.prepare = function(ignore, no_indicator)
     if (this.main_controller)
         $(this.spell_span).unbind('click');
 
-    this.orginal_text = $(this.text_area).val();
+    this.orginal_text = area.val();
 };
 
 this.parseResult = function(r_text)
@@ -674,10 +676,10 @@ this.createEditLayer = function(width, height)
 {
     this.edit_layer = document.createElement('div');
     $(this.edit_layer).addClass('googie_edit_layer').attr('id', 'googie_edit_layer')
-        .width('auto').height(height);
+        .width(width).height(height);
 
     if (this.text_area.nodeName.toLowerCase() != 'input' || $(this.text_area).val() == '') {
-        $(this.edit_layer).css('overflow', 'auto').height(height-4);
+        $(this.edit_layer).css('overflow', 'auto');
     } else {
         $(this.edit_layer).css('overflow', 'hidden');
     }
diff --git a/program/js/tinymce/roundcube/content.css b/program/js/tinymce/roundcube/content.css
index 67480ab77..0ad246ea0 100644
--- a/program/js/tinymce/roundcube/content.css
+++ b/program/js/tinymce/roundcube/content.css
@@ -7,9 +7,7 @@ body, td, pre {
 
 body {
 	background-color: #FFFFFF;
-	margin-left: 4px;
-	margin-right: 4px;
-	margin-top: 2px;
+	margin: 4px;
 }
 
 div.pre {
-- 
cgit v1.2.3