Ticket #8832: 8832.patch

_source/plugins/stylesheetparser/plugin.js

@@ -93 +93 @@
         CKEDITOR.plugins.add( 'stylesheetparser',
         {
                 requires: [ 'styles' ],
-                onLoad : function()
+                init : function( editor )
                 {
-                        var obj = CKEDITOR.editor.prototype;
-                        obj.getStylesSet = CKEDITOR.tools.override( obj.getStylesSet,  function( org )
+                        var definitions,
+                                timer;
+
+                        editor.on( 'mode', function( e )
                         {
-                                return function( callback )
-                                {
-                                        var self = this;
-                                        org.call( this, function( definitions )
+                                // If there was a timeout pending, cancel it
+                                if ( timer )
+                                        window.clearTimeout( timer );
+                                timer = null;
+
+                                if ( editor.mode != 'wysiwyg' )
+                                        return;
+
+                                // Do this only once for non-full page
+                                if ( !editor.config.fullPage )
+                                        e.removeListener();
+
+                                // Use a delay before parsing the stylesheet to avoid errors with Firefox 4. #7784
+                                // Safari requires even greater delay
+                                timer = window.setTimeout( function() {
+                                        editor.getStylesSet( function( stylesDefinitions )
                                         {
-                                                // Rules that must be skipped
-                                                var skipSelectors = self.config.stylesheetParser_skipSelectors || ( /(^body\.|^\.)/i ),
+                                                // Use the original definitions or set them at this time
+                                                definitions = definitions || stylesDefinitions;
+
+                                                        // Rules that must be skipped
+                                                var skipSelectors = editor.config.stylesheetParser_skipSelectors || ( /(^body\.|^\.)/i ),
                                                         // Rules that are valid
-                                                        validSelectors = self.config.stylesheetParser_validSelectors || ( /\w+\.\w+/ );
+                                                        validSelectors = editor.config.stylesheetParser_validSelectors || ( /\w+\.\w+/ );
 
-                                                callback( ( self._.stylesDefinitions = definitions.concat( LoadStylesCSS( self.document.$, skipSelectors, validSelectors ) ) ) );
-                                        });
-                                };
+                                                // Add the styles found in the document
+                                                editor._.stylesDefinitions = definitions.concat( LoadStylesCSS( editor.document.$, skipSelectors, validSelectors ) );
+
+                                                // Refresh the styles combo
+                                                var combo = editor.ui._.items[ 'Styles' ];
+                                                combo && combo.args[ 0 ].reset();
+                                        } );
+                                }, 1000 );
                         });
 
                 }