Ticket #6522: 6522_2.patch

_source/plugins/indent/plugin.js

@@ -9 +9 @@
 
 (function()
 {
-        var listNodeNames = { ol : 1, ul : 1 };
-
-        var isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),
+        var listNodeNames = { ol : 1, ul : 1 },
+                isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),
                 isNotBookmark = CKEDITOR.dom.walker.bookmark( false, true );
 
-        function setState( editor, state )
-        {
-                editor.getCommand( this.name ).setState( state );
-        }
-
         function onSelectionChange( evt )
         {
                 var editor = evt.editor;
@@ -27 +21 @@
                                 list = elementPath && elementPath.contains( listNodeNames );
 
                 if ( list )
-                                return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
+                                return this.setState( CKEDITOR.TRISTATE_OFF );
 
                 if ( !this.useIndentClasses && this.name == 'indent' )
-                        return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
+                        return this.setState( CKEDITOR.TRISTATE_OFF );
 
                 var path = evt.data.path,
                         firstBlock = path.block || path.blockLimit;
                 if ( !firstBlock )
-                        return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );
+                        return this.setState( CKEDITOR.TRISTATE_DISABLED );
 
                 if ( this.useIndentClasses )
                 {
@@ -48 +42 @@
                         }
                         if ( ( this.name == 'outdent' && !indentStep ) ||
                                         ( this.name == 'indent' && indentStep == editor.config.indentClasses.length ) )
-                                return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );
-                        return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
+                                return this.setState( CKEDITOR.TRISTATE_DISABLED );
+                        return this.setState( CKEDITOR.TRISTATE_OFF );
                 }
                 else
                 {
@@ -57 +51 @@
                         if ( isNaN( indent ) )
                                 indent = 0;
                         if ( indent <= 0 )
-                                return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );
-                        return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
+                                return this.setState( CKEDITOR.TRISTATE_DISABLED );
+                        return this.setState( CKEDITOR.TRISTATE_OFF );
                 }
         }
 
@@ -352 +346 @@
                 init : function( editor )
                 {
                         // Register commands.
-                        var indent = new indentCommand( editor, 'indent' ),
-                                outdent = new indentCommand( editor, 'outdent' );
-                        editor.addCommand( 'indent', indent );
-                        editor.addCommand( 'outdent', outdent );
+                        var indent = editor.addCommand( 'indent', new indentCommand( editor, 'indent' ) ),
+                                outdent = editor.addCommand( 'outdent', new indentCommand( editor, 'outdent' ) );
 
                         // Register the toolbar buttons.
                         editor.ui.addButton( 'Indent',
@@ -390 +382 @@
                                 var range = new CKEDITOR.dom.range( editor.document );
                                 range.setStartBefore( e.data );
                                 range.setEndAfter( e.data );
-                                
+
                                 var walker = new CKEDITOR.dom.walker( range ),
                                         node;
 

_source/plugins/list/plugin.js

@@ -183 +183 @@
                 }
         };
 
-        function setState( editor, state )
-        {
-                editor.getCommand( this.name ).setState( state );
-        }
-
         function onSelectionChange( evt )
         {
                 var path = evt.data.path,
                         blockLimit = path.blockLimit,
                         elements = path.elements,
-                        element;
+                        element,
+                        i;
 
                 // Grouping should only happen under blockLimit.(#3940).
-                for ( var i = 0 ; i < elements.length && ( element = elements[ i ] )
+                for ( i = 0 ; i < elements.length && ( element = elements[ i ] )
                           && !element.equals( blockLimit ); i++ )
                 {
                         if ( listNodeNames[ elements[i].getName() ] )
-                        {
-                                return setState.call( this, evt.editor,
-                                                this.type == elements[i].getName() ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
-                        }
+                                return this.setState( this.type == elements[i].getName() ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
                 }
 
-                return setState.call( this, evt.editor, CKEDITOR.TRISTATE_OFF );
+                return this.setState( CKEDITOR.TRISTATE_OFF );
         }
 
         function changeListType( editor, groupObj, database, listsCreated )
@@ -292 +285 @@
                                 {
                                         listContents.push( contentNode );
 
-                                        // Determine the lists's direction. 
+                                        // Determine the lists's direction.
                                         if ( !explicitDirection && contentNode.getDirection() )
                                                 explicitDirection = 1;
 
@@ -340 +333 @@
                                         contentBlock.removeStyle( 'direction' );
                                         contentBlock.removeAttribute( 'dir' );
                                 }
-                                
+
                                 contentBlock.copyAttributes( listItem );
                                 contentBlock.moveChildren( listItem );
                                 contentBlock.remove();
@@ -472 +465 @@
                                                 enclosedNode = range && range.getEnclosedNode();
                                         if ( enclosedNode && enclosedNode.is
                                                 && this.type == enclosedNode.getName() )
-                                                        setState.call( this, editor, CKEDITOR.TRISTATE_ON );
+                                                        this.setState( CKEDITOR.TRISTATE_ON );
                                 }
                         }
 
@@ -673 +666 @@
                 init : function( editor )
                 {
                         // Register commands.
-                        var numberedListCommand = new listCommand( 'numberedlist', 'ol' ),
-                                bulletedListCommand = new listCommand( 'bulletedlist', 'ul' );
-                        editor.addCommand( 'numberedlist', numberedListCommand );
-                        editor.addCommand( 'bulletedlist', bulletedListCommand );
+                        var numberedListCommand = editor.addCommand( 'numberedlist', new listCommand( 'numberedlist', 'ol' ) ),
+                                bulletedListCommand = editor.addCommand( 'bulletedlist', new listCommand( 'bulletedlist', 'ul' ) );
 
                         // Register the toolbar button.
                         editor.ui.addButton( 'NumberedList',