Changeset 4836

Timestamp:

12/29/09 15:05:28 (3 years ago)

Author:

garry.yao

Message:

#4835: fixing regression of [4653] from 3.1.x branch.

Location:

CKEditor/trunk/_source

Files:

• plugins/maximize/plugin.js (modified) (1 diff)
• skins/kama/mainui.css (modified) (1 diff)
• skins/office2003/mainui.css (modified) (1 diff)
• skins/v2/mainui.css (modified) (1 diff)
• themes/default/theme.js (modified) (2 diffs)

CKEditor/trunk/_source/plugins/maximize/plugin.js

@@ -115 +115 @@
                                         exec : function()
                                         {
-                                                var container = editor.container.getChild( [ 0, 0 ] );
+                                                var container = editor.container.getChild( 0 );
                                                 var contents = editor.getThemeSpace( 'contents' );
 

CKEditor/trunk/_source/skins/kama/mainui.css

@@ -17 +17 @@
         border: 1px solid #D3D3D3;
         padding: 5px;
+}
+
+.cke_skin_kama span.cke_browser_webkit
+{
+        display: block;
 }
 

CKEditor/trunk/_source/skins/office2003/mainui.css

@@ -11 +11 @@
         display: inline-table;
         width: 100%;
+}
+
+.cke_skin_office2003 span.cke_browser_webkit
+{
+        display: block;
 }
 

CKEditor/trunk/_source/skins/v2/mainui.css

@@ -14 +14 @@
 
 .cke_skin_v2
+{
+        display: block;
+}
+
+.cke_skin_v2 span.cke_browser_webkit
 {
         display: block;

CKEditor/trunk/_source/themes/default/theme.js

@@ -277 +277 @@
                 width += 'px';
 
-        var contents = CKEDITOR.document.getById( 'cke_contents_' + this.name );
-        var outer = resizeInner ? contents.getAscendant( 'table' ).getParent()
-                : contents.getAscendant( 'table' ).getParent().getParent().getParent();
+        var container = this.container,
+                contents = CKEDITOR.document.getById( 'cke_contents_' + this.name ),
+                outer = resizeInner ? container.getChild( 0 ) : container;
 
         // Resize the width first.
@@ -303 +303 @@
 CKEDITOR.editor.prototype.getResizable = function()
 {
-        return this.container.getChild( [ 0, 0 ] );
+        return this.container.getChild( 0 );
 };