Ticket #3893: 3893_8.patch

_source/core/dom/elementpath.js

@@ -100 +100 @@
                 }
 
                 return true;
-        }
+        },
+
+        contains : function( tagNames )
+        {
+                var elements = this.elements;
+                for ( var i = 0 ; i < elements.length ; i++ )
+                {
+                        if ( elements[ i ].getName() in tagNames )
+                                return elements[ i ];
+                }
+        }
 };

_source/plugins/indent/plugin.js

@@ -18 +18 @@
 
         function onSelectionChange( evt )
         {
-                var elements = evt.data.path.elements,
-                        listNode, listItem,
-                        editor = evt.editor;
+                var editor = evt.editor;
 
-                for ( var i = 0 ; i < elements.length ; i++ )
-                {
-                        if ( elements[i].getName() == 'li' )
-                        {
-                                listItem = elements[i];
-                                continue;
-                        }
-                        if ( listNodeNames[ elements[i].getName() ] )
-                        {
-                                listNode = elements[i];
-                                break;
-                        }
-                }
+                var elementPath = evt.data.path,
+                                list = elementPath && elementPath.contains( listNodeNames );
 
-                if ( listNode )
-                {
-                        if ( this.name == 'outdent' )
-                                return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
-                        else
-                        {
-                                while ( listItem && ( listItem = listItem.getPrevious( CKEDITOR.dom.walker.whitespaces( true ) ) ) )
-                                {
-                                        if ( listItem.getName && listItem.getName() == 'li' )
-                                                return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
-                                }
-                                return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );
-                        }
-                }
+                if ( list )
+                        return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
 
                 if ( !this.useIndentClasses && this.name == 'indent' )
                         return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
@@ -200 +175 @@
                 iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
                 var block;
                 while ( ( block = iterator.getNextParagraph() ) )
-                {
+                        indentElement.call( this, editor, block );
+        }
 
-                        if ( this.useIndentClasses )
-                        {
-                                // Transform current class name to indent step index.
-                                var indentClass = block.$.className.match( this.classNameRegex ),
-                                        indentStep = 0;
-                                if ( indentClass )
-                                {
-                                        indentClass = indentClass[1];
-                                        indentStep = this.indentClassMap[ indentClass ];
-                                }
+        function indentElement( editor, element )
+        {
+                if ( this.useIndentClasses )
+                {
+                        // Transform current class name to indent step index.
+                        var indentClass = element.$.className.match( this.classNameRegex ),
+                                indentStep = 0;
+                        if ( indentClass )
+                        {
+                                indentClass = indentClass[1];
+                                indentStep = this.indentClassMap[ indentClass ];
+                        }
 
-                                // Operate on indent step index, transform indent step index back to class
-                                // name.
-                                if ( this.name == 'outdent' )
-                                        indentStep--;
-                                else
-                                        indentStep++;
-                                indentStep = Math.min( indentStep, editor.config.indentClasses.length );
-                                indentStep = Math.max( indentStep, 0 );
-                                var className = CKEDITOR.tools.ltrim( block.$.className.replace( this.classNameRegex, '' ) );
-                                if ( indentStep < 1 )
-                                        block.$.className = className;
-                                else
-                                        block.$.className = CKEDITOR.tools.ltrim( className + ' ' + editor.config.indentClasses[ indentStep - 1 ] );
-                        }
-                        else
-                        {
-                                var currentOffset = parseInt( block.getStyle( this.indentCssProperty ), 10 );
-                                if ( isNaN( currentOffset ) )
-                                        currentOffset = 0;
-                                currentOffset += ( this.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;
-                                currentOffset = Math.max( currentOffset, 0 );
-                                currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
-                                block.setStyle( this.indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );
-                                if ( block.getAttribute( 'style' ) === '' )
-                                        block.removeAttribute( 'style' );
-                        }
-                }
-        }
+                        // Operate on indent step index, transform indent step index back to class
+                        // name.
+                        if ( this.name == 'outdent' )
+                                indentStep--;
+                        else
+                                indentStep++;
+
+                        if ( indentStep < 0 )
+                                return false;
+
+                        indentStep = Math.min( indentStep, editor.config.indentClasses.length );
+                        indentStep = Math.max( indentStep, 0 );
+                        var className = CKEDITOR.tools.ltrim( element.$.className.replace( this.classNameRegex, '' ) );
+                        if ( indentStep < 1 )
+                                element.$.className = className;
+                        else
+                                element.addClass( editor.config.indentClasses[ indentStep - 1 ] );
+                }
+                else
+                {
+                        var currentOffset = parseInt( element.getStyle( this.indentCssProperty ), 10 );
+                        if ( isNaN( currentOffset ) )
+                                currentOffset = 0;
+                        currentOffset += ( this.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;
+
+                        if ( currentOffset < 0 )
+                                return false;
+
+                        currentOffset = Math.max( currentOffset, 0 );
+                        currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
+                        element.setStyle( this.indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );
+                        if ( element.getAttribute( 'style' ) === '' )
+                                element.removeAttribute( 'style' );
+                }
+
+                return true;
+        }
 
         function indentCommand( editor, name )
         {
@@ -258 +245 @@
                 this.startDisabled = name == 'outdent';
         }
 
+        function isListItem( node ){ return node.type = CKEDITOR.NODE_ELEMENT && node.is( 'li' ) };
+
         indentCommand.prototype = {
                 exec : function( editor )
                 {
                         var selection = editor.getSelection(),
                                 range = selection && selection.getRanges()[0];
 
-                        if ( !selection || !range )
-                                return;
+                        var startContainer = range.startContainer,
+                                endContainer = range.endContainer,
+                                rangeRoot = range.getCommonAncestor(),
+                                nearestListBlock = rangeRoot;
 
-                        var bookmarks = selection.createBookmarks( true ),
-                                nearestListBlock = range.getCommonAncestor();
-
                         while ( nearestListBlock && !( nearestListBlock.type == CKEDITOR.NODE_ELEMENT &&
                                 listNodeNames[ nearestListBlock.getName() ] ) )
                                 nearestListBlock = nearestListBlock.getParent();
 
-                        if ( nearestListBlock )
-                                indentList.call( this, editor, range, nearestListBlock );
+                        // Avoid selection anchors under list root.
+                        // <ul>[<li>...</li>]</ul> =>   <ul><li>[...]</li></ul>
+                        if ( nearestListBlock && startContainer.type == CKEDITOR.NODE_ELEMENT
+                                && startContainer.getName() in listNodeNames )
+                        {
+                                var walker = new CKEDITOR.dom.walker( range );
+                                walker.evaluator = isListItem;
+                                range.startContainer = walker.next();
+                        }
+
+                        if ( nearestListBlock && endContainer.type == CKEDITOR.NODE_ELEMENT
+                                && endContainer.getName() in listNodeNames )
+                        {
+                                var walker = new CKEDITOR.dom.walker( range );
+                                walker.evaluator = isListItem;
+                                range.endContainer = walker.previous();
+                        }
+                        
+                        var bookmarks = selection.createBookmarks( true );
+
+                        if ( nearestListBlock  )
+                        {
+                                var firstListItem = nearestListBlock.getFirst( function( node )
+                                        {
+                                                return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' );
+                                        }),
+                                        rangeStart = range.startContainer,
+                                        indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );
+
+                                // Indent the entire list if  cursor is inside the first list item. (#3893)
+                                if ( !( indentWholeList && indentElement.call( this, editor, nearestListBlock ) ) )
+                                        indentList.call( this, editor, range, nearestListBlock );
+                        }
                         else
                                 indentBlock.call( this, editor, range );
 
@@ -310 +329 @@
                         // Register the state changing handlers.
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, indent ) );
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, outdent ) );
+
+                        // [IE6/7] Raw lists are using margin instead of padding for visual indentation in wysiwyg mode. (#3893)
+                        if( CKEDITOR.env.ie6Compat || CKEDITOR.env.ie7Compat )
+                        {
+                                var listStyleText =
+                                "ul,ol" +
+                                "{" +
+                                "       margin-left: 0px;" +
+                                "       padding-left: 40px;" +
+                                "}";
+                                editor  .addCss( listStyleText );
+                        }
                 },
 
                 requires : [ 'domiterator', 'list' ]