Changeset 804

Timestamp:

2007-09-12 11:12:57 (15 months ago)

Author:

martinkou

Message:

Fixed #427 and #277 : Fixed the issue where unneeded <div> tags are added inside list items when the text justification is applied.
Merged test cases from Fred's patch.

Location:

FCKeditor/trunk

Files:

• editor/fckeditor.html (modified) (1 diff)
• editor/_source/commandclasses/fckjustifycommands.js (added)
• editor/_source/internals/fckcommands.js (modified) (1 diff)
• fckpackager.xml (modified) (2 diffs)
• _test/automated/tests/fckdomrange.html (modified) (3 diffs)
• _test/manual/fckdomrange/test1.html (modified) (4 diffs)
• _test/manual/fckdomrange/test1_inner.html (modified) (1 diff)

FCKeditor/trunk/editor/fckeditor.html

@@ -117 +117 @@
 LoadScript( '_source/commandclasses/fckfitwindow.js' ) ;
 LoadScript( '_source/commandclasses/fcklistcommands.js' ) ;
+LoadScript( '_source/commandclasses/fckjustifycommands.js' ) ;
 LoadScript( '_source/commandclasses/fckcorestylecommand.js' ) ;
 LoadScript( '_source/commandclasses/fckremoveformatcommand.js' ) ;

FCKeditor/trunk/editor/_source/internals/fckcommands.js

@@ -89 +89 @@
                 case 'PasteWord'        : oCommand = new FCKPasteWordCommand() ; break ;
 
+                case 'JustifyLeft'      : oCommand = new FCKJustifyCommand( 'left' ) ; break ;
+                case 'JustifyCenter'    : oCommand = new FCKJustifyCommand( 'center' ) ; break ;
+                case 'JustifyRight'     : oCommand = new FCKJustifyCommand( 'right' ) ; break ;
+                case 'JustifyFull'      : oCommand = new FCKJustifyCommand( 'justify' ) ; break ;
+
                 case 'TableInsertRowAfter'              : oCommand = new FCKTableCommand('TableInsertRowAfter') ; break ;
                 case 'TableInsertRowBefore'             : oCommand = new FCKTableCommand('TableInsertRowBefore') ; break ;

FCKeditor/trunk/fckpackager.xml

@@ -127 +127 @@
                 <File path="editor/_source/commandclasses/fckfitwindow.js" />
                 <File path="editor/_source/commandclasses/fcklistcommands.js" />
+                <File path="editor/_source/commandclasses/fckjustifycommands.js" />
                 <File path="editor/_source/commandclasses/fckcorestylecommand.js" />
                 <File path="editor/_source/commandclasses/fckremoveformatcommand.js" />
@@ -218 +219 @@
                 <File path="editor/_source/commandclasses/fckfitwindow.js" />
                 <File path="editor/_source/commandclasses/fcklistcommands.js" />
+                <File path="editor/_source/commandclasses/fckjustifycommands.js" />
                 <File path="editor/_source/commandclasses/fckcorestylecommand.js" />
                 <File path="editor/_source/commandclasses/fckremoveformatcommand.js" />

FCKeditor/trunk/_test/automated/tests/fckdomrange.html

@@ -28 +28 @@
         <script type="text/javascript">
 
+var FCKConfig = { EnterMode : 'p' } ;
+
 FCKScriptLoader.Load( 'FCKDomRange' ) ;
 
@@ -529 +531 @@
         if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ;
 
-        assertEquals( 'Range HTML', 'this text has no block tag. it should be corrected when working with the enter key set to p or div tags. the <strong id=_strongnopara>br configuration</strong> should not make changes instead.', GetTestInnerHtml( tmpDiv ) ) ;
+        assertEquals( 'Range HTML', 'this text has no block tag.<br>it should be corrected when working with the enter key set to p or div tags. the <strong id=_strongnopara>br configuration</strong> should not make changes instead.<br>it has three lines separated by br tags.', GetTestInnerHtml( tmpDiv ) ) ;
 }
 
@@ -613 +615 @@
                         alt="" />
         </p>
-        This text has no block tag. It should be corrected when working with the enter key
+        This text has no block tag.<br />It should be corrected when working with the enter key
         set to "p" or "div" tags. The <strong id="_StrongNoPara">"br" configuration</strong>
-        should not make changes instead.
+        should not make changes instead.<br />It has three lines separated by BR tags.
         <p>
                 In the test we will try to recreate this document using the editor tools. To make

FCKeditor/trunk/_test/manual/fckdomrange/test1.html

@@ -37 +37 @@
 FCKConfig.Debug = false ;
 FCKConfig.BasePath = '../../../editor/' ;
+FCKConfig.EnterMode = 'br' ;
+
+FCKListsLib.Setup() ;
 
 var oRange ;
@@ -56 +59 @@
         document.getElementById('xEndNode').innerHTML                   = ( oRange.EndNode ? oRange.EndNode.nodeType == 1 ? oRange.EndNode.tagName : '[text]' : 'null' ) ;
         
-        document.getElementById('xStartNode').title     = oRange.StartNode.nodeType == 1 ? '' : oRange.StartNode.nodeValue ;
-        document.getElementById('xEndNode').title       = oRange.EndNode.nodeType == 1 ? '' : oRange.EndNode.nodeValue ;
+        document.getElementById('xStartNode').title     = ( !oRange.StartNode || oRange.StartNode.nodeType == 1 ) ? '' : oRange.StartNode.nodeValue ;
+        document.getElementById('xEndNode').title       = ( !oRange.EndNode || oRange.EndNode.nodeType == 1 ) ? '' : oRange.EndNode.nodeValue ;
 }
 
@@ -169 +172 @@
         UpdateDetails() ;
         oRange.Window.focus() ;
+}
+
+function GetParagraphs()
+{
+        var paragraphs = oRange.GetParagraphs() ;
+        
+        var msg = '' ;
+
+        var div = oRange.Window.document.createElement( 'div' ) ;
+
+        // To avoid breaking ranges, we should process it in reverse order.
+        for ( var i = paragraphs.length - 1 ; i >= 0 ; i-- )
+        {
+                div.innerHTML = '' ;
+                paragraphs[i].ExtractContents().AppendTo( div ) ;
+                msg = div.innerHTML + '\n---\n' + msg ;
+        }
+        
+        msg = 'Number of ranges: ' + paragraphs.length + '\n---\n' + msg ;
+        
+        alert( msg ) ;
 }
 
@@ -223 +247 @@
                 <input type="button" value="Check Is Collapsed" onclick="CheckIsCollapsed(); return false;" />
                 <input type="button" value="Check Is Empty" onclick="CheckIsEmpty(); return false;" />
+                <input type="button" value="Get Paragraphs" onclick="GetParagraphs(); return false;" />
         </p>
         <table>

FCKeditor/trunk/_test/manual/fckdomrange/test1_inner.html

@@ -86 +86 @@
                         alt="" />
         </p>
-        This text has no block tag. It should be corrected when working with the enter key
+        This text has no block tag.<br />
+        It should be corrected when working with the enter key
         set to "p" or "div" tags. The <strong>"br" configuration</strong> should not make
-        changes instead.
+        changes instead.<br />
+        It has three lines separated by BR.
         <p>
                 In the test we will try to recreate this document using the editor tools. To make