Ticket #901: 901.patch

_source/plugins/stylescombo/plugin.js

@@ -185 +185 @@
 
                                                 if ( !counter[ CKEDITOR.STYLE_OBJECT ] )
                                                         this.hideGroup( lang[ 'panelTitle' + String( CKEDITOR.STYLE_OBJECT ) ] );
+                                        },
+
+                                        // Force a reload of the data
+                                        reset: function()
+                                        {
+                                                stylesList = [];
+                                                loadStylesSet();
                                         }
                                 });
 

_source/plugins/stylesheetparser/plugin.js

@@ +1 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @stylesheetParser plugin.
+ */
+
+(function()
+{
+                // Rules that must be skipped
+        var skipSelectors,
+                // Rules that are valid
+                validSelectors;
+
+        // We want to extract only the elements with classes defined in the stylesheets:
+        function parseClasses( aRules )
+        {
+                // aRules are just the different rules in the style sheets
+                // We want to merge them and them split them by commas, so we end up with only
+                // the selectors
+                var s = aRules.join(' ');
+                // Remove selectors splitting the elements, leave only the class selector (.)
+                s = s.replace( /(,|>|\+|~)/g, ' ' );
+                // Remove attribute selectors: table[border="0"]
+                s = s.replace( /\[[^\]]*/g, '' );
+                // Remove Ids: div#main
+                s = s.replace( /#[^\s]*/g, '' );
+                // Remove pseudo-selectors and pseudo-elements: :hover :nth-child(2n+1) ::before
+                s = s.replace( /\:{1,2}[^\s]*/g, '' );
+
+                s = s.replace( /\s+/g, ' ' );
+                var aSelectors = s.split( ' ' ) ,
+                        aClasses = [];
+
+                for( var i=0; i<aSelectors.length; i++ )
+                {
+                        var selector = aSelectors[ i ];
+
+                        if ( validSelectors.test( selector ) && !skipSelectors.test( selector ) )
+                        {
+                                // If we still don't know about this one, add it
+                                if ( CKEDITOR.tools.indexOf( aClasses, selector ) == -1 )
+                                        aClasses.push( selector );
+                        }
+                }
+
+                return aClasses;
+        }
+
+        function LoadStylesCSS( theDoc )
+        {
+                var styles = [],
+                        // It will hold all the rules of the applied stylesheets (except those internal to CKEditor)
+                        aRules = [],
+                        i;
+                for( i = 0; i < theDoc.styleSheets.length; i++ )
+                {
+                        var sheet = theDoc.styleSheets[ i ],
+                                node = sheet.ownerNode || sheet.owningElement;
+
+                        // Skip the internal stylesheets
+                        if ( node.getAttribute( 'cke_temp' ) )
+                                continue;
+
+                        // Exclude stylesheets injected by extensions
+                        if ( sheet.href && sheet.href.substr(0, 9) == 'chrome://' )
+                                continue;
+
+                        var sheetRules = (sheet.cssRules || sheet.rules);
+                        for( var j = 0; j < sheetRules.length; j++ )
+                                aRules.push( sheetRules[j].selectorText );
+                }
+
+                var aClasses = parseClasses( aRules );
+
+                // Add each style to our "Styles" collection.
+                for( i=0; i<aClasses.length; i++ )
+                {
+                        var oElement = aClasses[ i ].split( '.' ),
+                                element = oElement[ 0 ].toLowerCase(),
+                                sClassName = oElement[ 1 ];
+
+                        styles.push( {
+                                name : aClasses[ i ],
+                                element : element,
+                                attributes : {'class' : sClassName}
+                        });
+                }
+
+                return styles;
+        }
+
+        // Register a plugin named "stylesheetparser".
+        CKEDITOR.plugins.add( 'stylesheetparser',
+        {
+                init : function( editor )
+                {
+                        skipSelectors = editor.config.stylesheetParser_skipSelectors || /(^body\.|^\.)/i;
+                        validSelectors = editor.config.stylesheetParser_validSelectors || /\w+\.\w+/;
+
+                        editor.on( 'mode', function( e )
+                        {
+                                if ( editor.mode != 'wysiwyg' )
+                                        return;
+
+                                // Do this only once
+                                e.removeListener();
+
+                                editor.getStylesSet( function( stylesDefinitions )
+                                        {
+                                                // Add the styles found in the document
+                                                editor._.stylesDefinitions = stylesDefinitions.concat(  LoadStylesCSS( editor.document.$ ) );
+
+                                                // Refresh the styles combo
+                                                var combo = editor.ui._.items[ 'Styles' ];
+                                                combo && combo.args[0].reset();
+                                        } );
+                        });
+
+                }
+        });
+})();
+
+
+/**
+ * Regular Expression to check if a css rule must be skipped by
+ * the stylesheet parser plugin (so it's ignored and not available)
+ * @name CKEDITOR.config.stylesheetParser_skipSelectors
+ * @type RegExp
+ * @default /(^body\.|^\.)/i
+ * @since 3.5
+ * @example
+ * // Ignore rules for body, caption, only a class or classes starting with "high".
+ * config.stylesheetParser_skipSelectors = /(^body\.|^caption\.|\.high|^\.)/i;
+ */
+
+ /**
+ * Regular Expression to check if a css rule must be allowed by
+ * the stylesheet parser plugin
+ * @name CKEDITOR.config.stylesheetParser_validSelectors
+ * @type RegExp
+ * @default /\w+\.\w+/
+ * @since 3.5
+ * @example
+ * // Add only rules for p and span elements.
+ * config.stylesheetParser_validSelectors = /\^(p|span)\.\w+/;
+ */
+ No newline at end of file