Fix incorrect initial size, for #507

orbeon · Mar 25, 2015 · a5f4e5f · a5f4e5f
1 parent d92b679
commit a5f4e5f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/...sources-packaged/xbl/orbeon/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js b/...sources-packaged/xbl/orbeon/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
diff --git a/...ces-packaged/xbl/orbeon/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js b/...ces-packaged/xbl/orbeon/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
@@ -38,7 +38,9 @@
 				var deltaSize, d = ed.getDoc(), body = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
 
 				// Get height differently depending on the browser used
-				myHeight = tinymce.isIE ? body.scrollHeight : (tinymce.isWebKit && body.clientHeight == 0 ? 0 : body.offsetHeight);
+                // 2015-03-25 avernet Original code doesn't take the margins around the body into account
+				//myHeight = tinymce.isIE ? body.scrollHeight : (tinymce.isWebKit && body.clientHeight == 0 ? 0 : body.offsetHeight);
+				myHeight = ORBEON.jQuery(body).outerHeight(true);
 
 				// Don't make it smaller than the minimum height
 				if (myHeight > t.autoresize_min_height)
@@ -77,9 +79,10 @@
 			t.autoresize_max_height = parseInt(ed.getParam('autoresize_max_height', 0));
 
 			// Add padding at the bottom for better UX
-			ed.onInit.add(function(ed){
-				ed.dom.setStyle(ed.getBody(), 'paddingBottom', ed.getParam('autoresize_bottom_margin', 50) + 'px');
-			});
+            // 2015-03-25 avernet Don't add padding, which looked like a hack for incorrect code to compute height
+			//ed.onInit.add(function(ed){
+			//	ed.dom.setStyle(ed.getBody(), 'paddingBottom', ed.getParam('autoresize_bottom_margin', 50) + 'px');
+			//});
 
 			// Add appropriate listeners for resizing content area
 			ed.onChange.add(resize);

diff --git a/src/resources/forms/orbeon/builder/resources/cell/control-resources-editor/actions.coffee b/src/resources/forms/orbeon/builder/resources/cell/control-resources-editor/actions.coffee
@@ -64,7 +64,7 @@ resourceEditor = _.memoize ->
 
     afterTinyMCEInitialized = (f) ->
         if tinymceObject.initialized then f()
-        else tinymceObject.onPostRender.add(f)
+        else tinymceObject.onInit.add(f)
 
     makeSpaceForMCE = ->
         mceHeight = $(tinymceObject.container).height()
@@ -79,7 +79,6 @@ resourceEditor = _.memoize ->
         mceConfig = _.clone(YAHOO.xbl.fr.Tinymce.DefaultConfig)
         mceConfig.plugins += ',autoresize'
         mceConfig.autoresize_min_height = 100
-        mceConfig.autoresize_bottom_margin = 16 # Default padding for autoresize adds too much empty space at the bottom
 
         tinymceObject = new window.tinymce.Editor(tinymceAnchor.attr('id'), mceConfig)
         tinymceObject.render()
@@ -105,14 +104,19 @@ resourceEditor = _.memoize ->
     getValue          : ->
                             if lhha() == 'text'
                                 content = tinymceObject.getContent()
-                                # Workaround to TinyMCE issue, see https://twitter.com/avernet/status/579031182605750272
+                                # Workaround to TinyMCE issue, see
+                                # https://twitter.com/avernet/status/579031182605750272
                                 if content == '<div>\xa0</div>' then '' else content
                             else
                                 textfield.val()
     setValue          : (newValue) ->
                             if lhha() == 'text'
                                 afterTinyMCEInitialized ->
                                     tinymceObject.setContent(newValue)
+                                    # Workaround for resize not happening with empty values, see
+                                    # https://twitter.com/avernet/status/580798585291177984
+                                    tinymceObject.execCommand('mceAutoResize')
+
                             else
                                 textfield.val(newValue)
                                 textfield.focus()