Fix DFW autoresizing in WebKit when zoom != 100%, fixes #17927

git-svn-id: http://svn.automattic.com/wordpress/trunk@18379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
WordPress · Jun 30, 2011 · 16f9195 · 16f9195
1 parent d28ae2c
commit 16f9195
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js
@@ -120,8 +120,6 @@
 				// Get height differently depending on the browser used
 				if ( tinymce.isIE )
 					myHeight = d.body.scrollHeight;
-				else if ( tinymce.isWebKit )
-					myHeight = d.height;
 				else
 					myHeight = d.documentElement.offsetHeight;
 

diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js
diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz
diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -18,7 +18,7 @@
  *
  * @global string $tinymce_version
  */
-$tinymce_version = '342-20110610';
+$tinymce_version = '342-20110630';
 
 /**
  * Holds the cache manifest version