Ticket #3362: 3362.patch

_source/plugins/dialog/plugin.js

@@ -149 +149 @@
                 // page size on the dialog creation.
                 this.parts.dialog.setStyles(
                         {
-                                position : 'absolute',
+                                position : CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed',
                                 top : 0,
                                 left: 0,
                                 visibility : 'hidden'
@@ -548 +548 @@
                         else
                                 return;
 
+                        // FIREFOX BUG: Fix vanishing caret for Firefox 2 or Gecko 1.8.
+                        if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 )
+                        {
+                                var dialogElement = this.parts.dialog;
+                                dialogElement.setStyle( 'position', 'absolute' );
+                                setTimeout( function()
+                                        {
+                                                dialogElement.setStyle( 'position', 'fixed' );
+                                        }, 0 );
+                        }
+
+
                         // First, set the dialog to an appropriate size.
                         this.resize( definition.minWidth, definition.minHeight );
 

_source/skins/office2003/dialog.css

@@ -224 +224 @@
         cursor: pointer;
 }
 
+/* Gecko 1.8 layout workaround. */
+.cke_browser_gecko18.cke_skin_office2003 a.cke_dialog_tab,
+.cke_browser_gecko18.cke_skin_office2003 a:link.cke_dialog_tab,
+.cke_browser_gecko18.cke_skin_office2003 a:active.cke_dialog_tab,
+.cke_browser_gecko18.cke_skin_office2003 a:hover.cke_dialog_tab,
+.cke_browser_gecko18.cke_skin_office2003 a:visited.cke_dialog_tab
+{
+        display: inline;
+        position: relative;
+        top: 6px;
+}
+
 .cke_skin_office2003 a:hover.cke_dialog_tab
 {
         background-color: #f7f8fd;
@@ -335 +347 @@
         display: inline-block;
 }
 
+/* Gecko 1.8 does not support display: inline-block */
+.cke_browser_gecko18.cke_skin_office2003 .cke_dialog_footer_buttons span.cke_dialog_ui_button
+{
+        display: block;
+}
+
 .cke_skin_office2003 a.cke_dialog_ui_button span.cke_disabled
 {
         border: #898980 1px solid;
@@ -357 +375 @@
         position: relative;
 }
 
+/* Gecko 1.8 does not support for display: inline-table */
+.cke_browser_gecko18.cke_skin_office2003 .cke_dialog_footer_buttons
+{
+        display: inline;
+}
+
 .cke_skin_office2003 .cke_dialog_footer_buttons span.cke_dialog_ui_button
 {
         width: 60px;
@@ -551 +575 @@
 {
         color: #a0a0a0;
 }
-
-/* Firefox 2 */
-
-.cke_skin_office2003 .cke_browser_gecko .cke_dialog_tabs
-{
-        display: block;
-        float: left;
-}

_source/skins/v2/dialog.css

@@ -221 +221 @@
         cursor: pointer;
 }
 
+/* Gecko 1.8 layout workaround. */
+.cke_browser_gecko18.cke_skin_v2 a.cke_dialog_tab,
+.cke_browser_gecko18.cke_skin_v2 a:link.cke_dialog_tab,
+.cke_browser_gecko18.cke_skin_v2 a:active.cke_dialog_tab,
+.cke_browser_gecko18.cke_skin_v2 a:hover.cke_dialog_tab,
+.cke_browser_gecko18.cke_skin_v2 a:visited.cke_dialog_tab
+{
+        display: inline;
+        position: relative;
+        top: 6px;
+}
+
 .cke_skin_v2 a:hover.cke_dialog_tab
 {
         background-color: #f1f1e3;
@@ -329 +341 @@
         display: inline-block;
 }
 
+/* Gecko 1.8 does not support display: inline-block */
+.cke_browser_gecko18.cke_skin_v2 .cke_dialog_footer_buttons span.cke_dialog_ui_button
+{
+        display: block;
+}
+
 .cke_skin_v2 a.cke_dialog_ui_button span.cke_disabled
 {
         border: #898980 1px solid;
@@ -351 +369 @@
         position: relative;
 }
 
+/* Gecko 1.8 does not support for display: inline-table */
+.cke_browser_gecko18.cke_skin_v2 .cke_dialog_footer_buttons
+{
+        display: inline;
+}
+
 .cke_skin_v2 .cke_dialog_footer_buttons span.cke_dialog_ui_button
 {
         width: 60px;
@@ -550 +574 @@
 {
         color: #a0a0a0;
 }
-
-/* Firefox 2 */
-
-.cke_skin_v2 .cke_browser_gecko .cke_dialog_tabs
-{
-        display: block;
-        float: left;
-}

_source/core/env.js

@@ -184 +184 @@
                                 env.cssClass += ' cke_browser_iequirks';
                 }
 
+                if ( env.gecko && version < 10900 )
+                        env.cssClass += ' cke_browser_gecko18';
+
                 return env;
         })();
 }