Refs #3510, #9113. Updated tinyMCE version in trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 6 insertions, 12 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
index 279328614..84546ad52 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
@@ -44,19 +44,13 @@ function toggleWordWrap(elm) {
 		setWrap('off');

 }

 

-var wHeight=0, wWidth=0, owHeight=0, owWidth=0;

-

 function resizeInputs() {

-	var el = document.getElementById('htmlSource');

+	var vp = tinyMCEPopup.dom.getViewPort(window), el;

 

-	if (!tinymce.isIE) {

-		 wHeight = self.innerHeight - 65;

-		 wWidth = self.innerWidth - 16;

-	} else {

-		 wHeight = document.body.clientHeight - 70;

-		 wWidth = document.body.clientWidth - 16;

-	}

+	el = document.getElementById('htmlSource');

 

-	el.style.height = Math.abs(wHeight) + 'px';

-	el.style.width  = Math.abs(wWidth) + 'px';

+	if (el) {

+		el.style.width = (vp.w - 20) + 'px';

+		el.style.height = (vp.h - 65) + 'px';

+	}

 }