Index: /FCKeditor/trunk/_dev/browserbugs/opera/nbsp_innerHTML.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/opera/nbsp_innerHTML.html (revision 51) +++ /FCKeditor/trunk/_dev/browserbugs/opera/nbsp_innerHTML.html (revision 51) @@ -0,0 +1,17 @@ + + + + nbsp and innerHTML + + + + [      ] + + Index: /FCKeditor/trunk/_dev/browserbugs/safari/nbsp_innerHTML.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/safari/nbsp_innerHTML.html (revision 51) +++ /FCKeditor/trunk/_dev/browserbugs/safari/nbsp_innerHTML.html (revision 51) @@ -0,0 +1,17 @@ + + + + nbsp and innerHTML + + + + [      ] + + Index: /FCKeditor/trunk/_test/automated/tests/fckdomrange.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/fckdomrange.html (revision 51) +++ /FCKeditor/trunk/_test/automated/tests/fckdomrange.html (revision 51) @@ -0,0 +1,650 @@ + + + + FCKDomRange - Tests for JsUnit + + + + + + + + +

+ Test page for FCKeditor +

+

+ This document contains various markup features commonly used by content editors + or "rédacteurs de contenu" as they are + called in + France.
+ It is important that a WYSIWYG + tool has features that are easily available for the editor. If not, there is a risk + that content won't receive proper markup. Examples + of commonly found content are:

+

+   +

+

+

+
    +
  1. Headings
    2. +
  2. Links (with optional title)
    3. +
  3. Lists (like this one) + +
    4. +
  4. Tables + +
    5. +
  5. Language information
    6. +
  6. Acronyms and abbreviations
    7. +
  7. Emphasis and strong emphasis
    8. +
  8. Quotes, inline and block
    9. +
  9. Images
    10. +
+
+

+ Test procedure +

+ This text has no block tag. It should be corrected when working with the enter key + set to "p" or "div" tags. The "br" configuration should not make changes instead. +

+ In the test we will try to recreate this document using the editor tools. To make + sure tables can be inserted properly we re-visit banana import + statistics from 1998. +

+

+ This paragraph has and image at the very end of its contents. +

+ This text has no block tag. It should be corrected when working with the enter key + set to "p" or "div" tags. The "br" configuration + should not make changes instead. +

+ In the test we will try to recreate this document using the editor tools. To make + sure tables can be inserted properly we re-visit banana import statistics + from 1998. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Top banana importers 1998 (value of banana imports in millions of US dollars per + million people)
+
+
+ Country + Millions of US dollars per million people
+ Sweden + 17.12
+ United Kingdom + 8.88
+ Germany + 8.36
+ Italy + 5.96
+ United States + 4.78
+

+ For block quotes we will have a look at what Joe + Clark says about redheads:

+
+

+ "Since boyhood I’ve always believed, at the deepest level, that redheads are + standard-bearers of the grandest and most wondrous human beauty."

+
+

+

+

+ The above is the FCKeditor logo loaded from the FCKeditor.net web site.

+ + Index: /FCKeditor/trunk/_test/automated/tests/fcktools.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/fcktools.html (revision 50) +++ /FCKeditor/trunk/_test/automated/tests/fcktools.html (revision 51) @@ -31,12 +31,12 @@ } -function test_GetParentWindow() +function test_GetDocumentWindow() { // In IE, the type of the returned window is different of window, but it is ok. - if ( FCKTools.GetParentWindow( document ) != window ) + if ( FCKTools.GetDocumentWindow( document ) != window ) { assertEquals( window, - FCKTools.GetParentWindow( document ) ) ; + FCKTools.GetDocumentWindow( document ) ) ; } } @@ -55,4 +55,38 @@ } +function test_CloneObject() +{ + var original = + { + Text : 'Some Text', + Number : 10, + ArrayObject : [ 1, 3, 5 ] + } + + var clone = FCKTools.CloneObject( original ) ; + + assertEquals( 'original.Text', 'Some Text', original.Text ) ; + assertEquals( 'original.Number', 10, original.Number ) ; + assertEquals( 'original.ArrayObject.length', 3, original.ArrayObject.length) ; + + assertEquals( 'clone.Text', 'Some Text', clone.Text ) ; + assertEquals( 'clone.Number', 10, clone.Number ) ; + assertEquals( 'clone.ArrayObject.length', 3, clone.ArrayObject.length) ; + + clone.Text += ' Test' ; + clone.Number += 15 ; + clone.ArrayObject = new Array() ; + clone.ArrayObject.push( 2 ) ; + + assertEquals( 'original.Text', 'Some Text', original.Text ) ; + assertEquals( 'original.Number', 10, original.Number ) ; + assertEquals( 'original.ArrayObject.length', 3, original.ArrayObject.length) ; + + assertEquals( 'clone.Text', 'Some Text Test', clone.Text ) ; + assertEquals( 'clone.Number', 25, clone.Number ) ; + assertEquals( 'clone.ArrayObject.length', 1, clone.ArrayObject.length) ; + +} + Index: /FCKeditor/trunk/_test/automated/tests/fckw3crange.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/fckw3crange.html (revision 50) +++ /FCKeditor/trunk/_test/automated/tests/fckw3crange.html (revision 51) @@ -397,4 +397,38 @@ } +function test_deleteContents_Other_3() +{ + var range = FCKW3CRange.CreateRange( document ) ; + + range.selectNodeContents( document.getElementById('_B') ) ; + + range.deleteContents() ; + + assertEquals( '', GetTestInnerHtml( document.getElementById('_B') ) ) ; + + assertEquals( 'range.startContainer', document.getElementById('_B'), range.startContainer ) ; + assertEquals( 'range.startOffset', 0, range.startOffset ) ; + assertEquals( 'range.endContainer', document.getElementById('_B'), range.endContainer ) ; + assertEquals( 'range.endOffset', 0, range.endOffset ) ; + assertTrue( 'range.collapsed', range.collapsed ) ; +} + +function test_deleteContents_Other_4() +{ + var range = FCKW3CRange.CreateRange( document ) ; + + range.selectNodeContents( document.getElementById('_P') ) ; + + range.deleteContents() ; + + assertEquals( '', GetTestInnerHtml( document.getElementById('_P') ) ) ; + + assertEquals( 'range.startContainer', document.getElementById('_P'), range.startContainer ) ; + assertEquals( 'range.startOffset', 0, range.startOffset ) ; + assertEquals( 'range.endContainer', document.getElementById('_P'), range.endContainer ) ; + assertEquals( 'range.endOffset', 0, range.endOffset ) ; + assertTrue( 'range.collapsed', range.collapsed ) ; +} + // W3C DOM Range Specs - Section 2.7 - Example 1 function test_extractContents_W3C_1() @@ -426,5 +460,5 @@ range.setStart( document.getElementById( '_B' ).firstChild, 1 ) ; - range.setEnd( document.getElementById( '_B' ).nextSibling, 1 ) ; + range.setEnd( document.getElementById( '_B' ).nextSibling, 2 ) ; var docFrag = range.extractContents() ; @@ -433,6 +467,6 @@ if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - assertEquals( 'Extracted HTML', 'ome ', GetTestInnerHtml( tmpDiv ) ) ; - assertEquals( 'HTML after extraction', 'this is stext.', GetTestInnerHtml( document.getElementById( '_P' ) ) ) ; + assertEquals( 'Extracted HTML', 'ome t', GetTestInnerHtml( tmpDiv ) ) ; + assertEquals( 'HTML after extraction', 'this is sext.', GetTestInnerHtml( document.getElementById( '_P' ) ) ) ; assertEquals( 'range.startContainer', document.getElementById( '_P' ), range.startContainer ) ; @@ -533,4 +567,46 @@ } +function test_extractContents_Other_3() +{ + var range = FCKW3CRange.CreateRange( document ) ; + + range.selectNodeContents( document.getElementById('_B') ) ; + + var docFrag = range.extractContents() ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', 'some', GetTestInnerHtml( tmpDiv ) ) ; + assertEquals( 'HTML after extraction', '', GetTestInnerHtml( document.getElementById('_B') ) ) ; + + assertEquals( 'range.startContainer', document.getElementById('_B'), range.startContainer ) ; + assertEquals( 'range.startOffset', 0, range.startOffset ) ; + assertEquals( 'range.endContainer', document.getElementById('_B'), range.endContainer ) ; + assertEquals( 'range.endOffset', 0, range.endOffset ) ; + assertTrue( 'range.collapsed', range.collapsed ) ; +} + +function test_extractContents_Other_4() +{ + var range = FCKW3CRange.CreateRange( document ) ; + + range.selectNodeContents( document.getElementById('_P') ) ; + + var docFrag = range.extractContents() ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', 'this is some text.', GetTestInnerHtml( tmpDiv ) ) ; + assertEquals( 'HTML after extraction', '', GetTestInnerHtml( document.getElementById('_P') ) ) ; + + assertEquals( 'range.startContainer', document.getElementById('_P'), range.startContainer ) ; + assertEquals( 'range.startOffset', 0, range.startOffset ) ; + assertEquals( 'range.endContainer', document.getElementById('_P'), range.endContainer ) ; + assertEquals( 'range.endOffset', 0, range.endOffset ) ; + assertTrue( 'range.collapsed', range.collapsed ) ; +} + // W3C DOM Range Specs - Section 2.7 - Example 1 function test_cloneContents_W3C_1() @@ -567,5 +643,5 @@ range.setStart( document.getElementById( '_B' ).firstChild, 1 ) ; - range.setEnd( document.getElementById( '_B' ).nextSibling, 1 ) ; + range.setEnd( document.getElementById( '_B' ).nextSibling, 2 ) ; var bodyHtml = document.body.innerHTML ; @@ -576,5 +652,5 @@ if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - assertEquals( 'Cloned HTML', 'ome ', GetTestInnerHtml( tmpDiv ) ) ; + assertEquals( 'Cloned HTML', 'ome t', GetTestInnerHtml( tmpDiv ) ) ; // The body HTML must remain unchanged. @@ -585,5 +661,5 @@ assertEquals( 'range.startOffset', 1, range.startOffset ) ; assertEquals( 'range.endContainer', document.getElementById( '_B' ).nextSibling, range.endContainer ) ; - assertEquals( 'range.endOffset', 1, range.endOffset ) ; + assertEquals( 'range.endOffset', 2, range.endOffset ) ; assertFalse( 'range.collapsed', range.collapsed ) ; } @@ -696,4 +772,54 @@ assertEquals( 'range.endContainer', document.body, range.endContainer ) ; assertEquals( 'range.endOffset', 2, range.endOffset ) ; + assertFalse( 'range.collapsed', range.collapsed ) ; +} + +function test_cloneContents_Other_3() +{ + var range = FCKW3CRange.CreateRange( document ) ; + + range.selectNodeContents( document.getElementById('_B') ) ; + + var bodyHtml = document.body.innerHTML ; + + var docFrag = range.cloneContents() ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', 'some', GetTestInnerHtml( tmpDiv ) ) ; + + // The body HTML must remain unchanged. + assertEquals( bodyHtml, document.body.innerHTML ) ; + + assertEquals( 'range.startContainer', document.getElementById('_B'), range.startContainer ) ; + assertEquals( 'range.startOffset', 0, range.startOffset ) ; + assertEquals( 'range.endContainer', document.getElementById('_B'), range.endContainer ) ; + assertEquals( 'range.endOffset', 1, range.endOffset ) ; + assertFalse( 'range.collapsed', range.collapsed ) ; +} + +function test_cloneContents_Other_4() +{ + var range = FCKW3CRange.CreateRange( document ) ; + + range.selectNodeContents( document.getElementById('_P') ) ; + + var bodyHtml = document.body.innerHTML ; + + var docFrag = range.cloneContents() ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', 'this is some text.', GetTestInnerHtml( tmpDiv ) ) ; + + // The body HTML must remain unchanged. + assertEquals( bodyHtml, document.body.innerHTML ) ; + + assertEquals( 'range.startContainer', document.getElementById('_P'), range.startContainer ) ; + assertEquals( 'range.startOffset', 0, range.startOffset ) ; + assertEquals( 'range.endContainer', document.getElementById('_P'), range.endContainer ) ; + assertEquals( 'range.endOffset', 3, range.endOffset ) ; assertFalse( 'range.collapsed', range.collapsed ) ; } @@ -778,5 +904,5 @@ //window.onload = function() //{ -// test_cloneContents_W3C_1() ; +// test_extractContents_Other_3() ; //} Index: /FCKeditor/trunk/_test/automated/tests/suite.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/suite.html (revision 50) +++ /FCKeditor/trunk/_test/automated/tests/suite.html (revision 51) @@ -15,4 +15,5 @@ suite.addTestPage( '../tests/fcktools.html' ) ; suite.addTestPage( '../tests/fckw3crange.html' ) ; + suite.addTestPage( '../tests/fckdomrange.html' ) ; return suite ; Index: /FCKeditor/trunk/_test/automated/tests/tests.js =================================================================== --- /FCKeditor/trunk/_test/automated/tests/tests.js (revision 50) +++ /FCKeditor/trunk/_test/automated/tests/tests.js (revision 51) @@ -7,4 +7,4 @@ // quotes, uppercased and linebreaks). Transform it in something usable for // the tests assertions. - return element.innerHTML.replace( /"/g, '' ).toLowerCase().replace( /\n|\r/g, '' ) + return element.innerHTML.replace( /"/g, '' ).toLowerCase().replace( />\s*(\n|\r)+\s*<' ).replace( /\s*(\n|\r)+\s*/g, ' ' ).replace( /(^\s+)|(\s+$)/g, '' ) } Index: /FCKeditor/trunk/_test/manual/fckdomrange/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckdomrange/test1.html (revision 50) +++ /FCKeditor/trunk/_test/manual/fckdomrange/test1.html (revision 51) @@ -6,8 +6,14 @@