Ticket #5345: 5345_3.patch

_source/core/editor.js

@@ -230 +230 @@
                                 // Load all plugin specific language files in a row.
                                 CKEDITOR.scriptLoader.load( languageFiles, function()
                                         {
+                                                // Add-in all other config options that been defined on CKEDITOR in plugin files.
+                                                // TODO: Remove this line when we're free of global config definition in all plugins. 
+                                                 CKEDITOR.tools.extend( editor.config, CKEDITOR.tools.clone( CKEDITOR.config ) );
+
                                                 // Initialize all plugins that have the "beforeInit" and "init" methods defined.
                                                 var methods = [ 'beforeInit', 'init', 'afterInit' ];
                                                 for ( var m = 0 ; m < methods.length ; m++ )
@@ -390 +394 @@
                          * var editor = CKEDITOR.instances.editor1;
                          * alert( <b>editor.config.theme</b> );  "default" e.g.
                          */
-                        this.config = CKEDITOR.tools.prototypedCopy( CKEDITOR.config );
+                        this.config = CKEDITOR.tools.clone( CKEDITOR.config );
 
                         /**
                          * Namespace containing UI features related to this editor instance.
@@ -505 +509 @@
                         if ( this._.filebrowserFn )
                                 CKEDITOR.tools.removeFunction( this._.filebrowserFn );
 
-                        items = editor.config.elementsPath_filters;
-                        if ( items )
-                        {
-                                for ( index= 0 ; index < items.length ; index++ )
-                                        items[ index ] = null;
-                        }
-
                         this.fire( 'destroy' );
                         CKEDITOR.remove( this );
                         CKEDITOR.fire( 'instanceDestroyed', null, this );

_source/plugins/elementspath/plugin.js

@@ -33 +33 @@
 
                 init : function( editor )
                 {
+                        var config = editor.config,
+                                pathFilters = config.elementsPath_filters;
+
+                        config.elementsPath_filters = ( pathFilters || [] );
+
                         var spaceId = 'cke_path_' + editor.name;
                         var spaceElement;
                         var getSpaceElement = function()
@@ -56 +61 @@
                                         }
                                 });
 
-                        var filters = editor.config.elementsPath_filters;
-
                         editor.on( 'selectionChange', function( ev )
                                 {
-                                        var env = CKEDITOR.env;
-
-                                        var selection = ev.data.selection;
-
-                                        var element = selection.getStartElement(),
+                                        var env = CKEDITOR.env,
+                                                selection = ev.data.selection,
+                                                element = selection.getStartElement(),
                                                 html = [],
-                                                elementsList = this._.elementsPath.list = [];
+                                                editor = ev.editor,
+                                                elementsList = editor._.elementsPath.list = [],
+                                                filters = editor.config.elementsPath_filters;
 
                                         while ( element )
                                         {
@@ -114 +117 @@
                                                                         ( ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) ?
                                                                         ' onfocus="event.preventBubble();"' : '' ) +
                                                                         ' hidefocus="true" ' +
-                                                                        ' onkeydown="return CKEDITOR._.elementsPath.keydown(\'', this.name, '\',', index, ', event);"' +
+                                                                        ' onkeydown="return CKEDITOR._.elementsPath.keydown(\'', editor.name, '\',', index, ', event);"' +
                                                                         extra ,
-                                                                        ' onclick="return CKEDITOR._.elementsPath.click(\'', this.name, '\',', index, ');"',
+                                                                        ' onclick="return CKEDITOR._.elementsPath.click(\'', editor.name, '\',', index, ');"',
                                                                         ' role="button" aria-labelledby="' + idBase + index + '_label">',
                                                                                 name,
                                                                                 '<span id="', idBase, index, '_label" class="cke_label">' + label + '</span>',
@@ -206 +209 @@
 
 /**
  * A list of filter functions to determinate whether an element should display in elements path bar.
+ * @name CKEDITOR.config.elementsPath_filters
  * @type Array Array of functions that optionaly return 'false' to prevent the element from displaying.
- * @default  []
+ * @default []
  * @example
  *      // Prevent elements with attribute 'myAttribute' to appear in elements path.
  *      editor.config.elementsPath_filters.push( function( element )
@@ -216 +220 @@
  *                      return false;
  *      });
  */
-CKEDITOR.config.elementsPath_filters = [];