vanilla ckeditor-3.4.3

[ckeditor.git] / _source / plugins / indent / plugin.js

diff --git a/_source/plugins/indent/plugin.js b/_source/plugins/indent/plugin.js
index 50b1356..c49ce88 100644 (file)
--- a/_source/plugins/indent/plugin.js
+++ b/_source/plugins/indent/plugin.js
@@ -78,9 +78,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        }\r
 \r
        // Returns the CSS property to be used for identing a given element.\r
-       function getIndentCssProperty( element )\r
+       function getIndentCssProperty( element, dir )\r
        {\r
-               return element.getComputedStyle( 'direction' ) == 'ltr' ? 'margin-left' : 'margin-right';\r
+               return ( dir || element.getComputedStyle( 'direction' ) ) == 'ltr' ? 'margin-left' : 'margin-right';\r
        }\r
 \r
        function isListItem( node )\r
@@ -157,8 +157,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                // Convert the array back to a DOM forest (yes we might have a few subtrees now).\r
                                // And replace the old list with the new forest.\r
-                               var newListDir = listNode.getAttribute( 'dir' ) || listNode.getStyle( 'direction' );\r
-                               var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, newListDir );\r
+                               var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, listNode.getDirection() );\r
 \r
                                // Avoid nested <li> after outdent even they're visually same,\r
                                // recording them for later refactoring.(#3982)\r
@@ -220,7 +219,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        indentElement( block );\r
                        }\r
 \r
-                       function indentElement( element )\r
+                       function indentElement( element, dir )\r
                        {\r
                                if ( element.getCustomData( 'indent_processed' ) )\r
                                        return false;\r
@@ -248,15 +247,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                        indentStep = Math.min( indentStep, editor.config.indentClasses.length );\r
                                        indentStep = Math.max( indentStep, 0 );\r
-                                       var className = CKEDITOR.tools.ltrim( element.$.className.replace( self.classNameRegex, '' ) );\r
-                                       if ( indentStep < 1 )\r
-                                               element.$.className = className;\r
-                                       else\r
+                                       element.$.className = CKEDITOR.tools.ltrim( element.$.className.replace( self.classNameRegex, '' ) );\r
+                                       if ( indentStep > 0 )\r
                                                element.addClass( editor.config.indentClasses[ indentStep - 1 ] );\r
                                }\r
                                else\r
                                {\r
-                                       var indentCssProperty = getIndentCssProperty( element ),\r
+                                       var indentCssProperty = getIndentCssProperty( element, dir ),\r
                                                currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );\r
                                        if ( isNaN( currentOffset ) )\r
                                                currentOffset = 0;\r
@@ -328,10 +325,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                if ( nearestListBlock )\r
                                {\r
-                                       var firstListItem = nearestListBlock.getFirst( function( node )\r
-                                               {\r
-                                                       return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' );\r
-                                               }),\r
+                                       var firstListItem = nearestListBlock.getFirst( isListItem ),\r
+                                               hasMultipleItems = !!firstListItem.getNext( isListItem ),\r
                                                rangeStart = range.startContainer,\r
                                                indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );\r
 \r
@@ -339,7 +334,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        // Only do that for indenting or when using indent classes or when there is something to outdent. (#6141)\r
                                        if ( !( indentWholeList &&\r
                                                ( self.name == 'indent' || self.useIndentClasses || parseInt( nearestListBlock.getStyle( getIndentCssProperty( nearestListBlock ) ), 10 ) ) &&\r
-                                                       indentElement( nearestListBlock ) ) )\r
+                                                       indentElement( nearestListBlock, !hasMultipleItems && firstListItem.getDirection() ) ) )\r
                                                                indentList( nearestListBlock );\r
                                }\r
                                else\r
@@ -395,8 +390,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        editor.on( 'dirChanged', function( e )\r
                        {\r
                                var range = new CKEDITOR.dom.range( editor.document );\r
-                               range.setStartBefore( e.data );\r
-                               range.setEndAfter( e.data );\r
+                               range.setStartBefore( e.data.node );\r
+                               range.setEndAfter( e.data.node );\r
 \r
                                var walker = new CKEDITOR.dom.walker( range ),\r
                                        node;\r
@@ -406,13 +401,28 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        if ( node.type == CKEDITOR.NODE_ELEMENT )\r
                                        {\r
                                                // A child with the defined dir is to be ignored.\r
-                                               if ( !node.equals( e.data ) && node.getDirection() )\r
+                                               if ( !node.equals( e.data.node ) && node.getDirection() )\r
                                                {\r
                                                        range.setStartAfter( node );\r
                                                        walker = new CKEDITOR.dom.walker( range );\r
                                                        continue;\r
                                                }\r
 \r
+                                               // Switch alignment classes.\r
+                                               var classes = editor.config.indentClasses;\r
+                                               if ( classes )\r
+                                               {\r
+                                                       var suffix = ( e.data.dir == 'ltr' ) ? [ '_rtl', '' ] : [ '', '_rtl' ];\r
+                                                       for ( var i = 0; i < classes.length; i++ )\r
+                                                       {\r
+                                                               if ( node.hasClass( classes[ i ] + suffix[ 0 ] ) )\r
+                                                               {\r
+                                                                       node.removeClass( classes[ i ] + suffix[ 0 ] );\r
+                                                                       node.addClass( classes[ i ] + suffix[ 1 ] );\r
+                                                               }\r
+                                                       }\r
+                                               }\r
+\r
                                                // Switch the margins.\r
                                                var marginLeft = node.getStyle( 'margin-right' ),\r
                                                        marginRight = node.getStyle( 'margin-left' );\r
@@ -430,6 +440,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
 /**\r
  * Size of each indentation step\r
+ * @name CKEDITOR.config.indentOffset\r
  * @type Number\r
  * @default 40\r
  * @example\r
@@ -438,6 +449,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
  /**\r
  * Unit for the indentation style\r
+ * @name CKEDITOR.config.indentUnit\r
  * @type String\r
  * @default 'px'\r
  * @example\r
@@ -447,6 +459,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  /**\r
  * List of classes to use for indenting the contents. If it's null, no classes will be used\r
  * and instead the {@link #indentUnit} and {@link #indentOffset} properties will be used.\r
+ * @name CKEDITOR.config.indentClasses\r
  * @type Array\r
  * default null\r
  * @example\r