Index: /FCKeditor/branches/features/style/_test/automated/tests/fckdomtools.html =================================================================== --- /FCKeditor/branches/features/style/_test/automated/tests/fckdomtools.html (revision 758) +++ /FCKeditor/branches/features/style/_test/automated/tests/fckdomtools.html (revision 758) @@ -0,0 +1,119 @@ + + + + + FCKDomTools - 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:

+

+ 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. +

+ + Index: /FCKeditor/branches/features/style/_test/manual/fckdomrange/test1.html =================================================================== --- /FCKeditor/branches/features/style/_test/manual/fckdomrange/test1.html (revision 757) +++ /FCKeditor/branches/features/style/_test/manual/fckdomrange/test1.html (revision 758) @@ -35,5 +35,5 @@ + + + + + + + + + + + + + + + + + + + + +
+

+ FCKStyle & FCKStyles

+

+ + + + +

+
+ +
+ Source:
+ +
+ + Index: /FCKeditor/branches/features/style/_test/manual/fckstyle/test1_inner.html =================================================================== --- /FCKeditor/branches/features/style/_test/manual/fckstyle/test1_inner.html (revision 758) +++ /FCKeditor/branches/features/style/_test/manual/fckstyle/test1_inner.html (revision 758) @@ -0,0 +1,192 @@ + + + + + Test Page + + + + +

+ 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.
+ This line has a BR before it, as well as the next one
+ 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." +

+
+
+ This is some text inside a DIV. +
+

+ +

+

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

+
+

+ First para inside DIV

+

+ Second para inside DIV

+
+

+ Para outside DIV

+ + Index: /FCKeditor/branches/features/style/editor/_source/classes/fckdocumentfragment_gecko.js =================================================================== --- /FCKeditor/branches/features/style/editor/_source/classes/fckdocumentfragment_gecko.js (revision 757) +++ /FCKeditor/branches/features/style/editor/_source/classes/fckdocumentfragment_gecko.js (revision 758) @@ -44,4 +44,9 @@ { FCKDomTools.InsertAfterNode( existingNode, this.RootNode ) ; + }, + + InsertBeforeNode : function( existingNode ) + { + existingNode.parentNode.insertBefore( this.RootNode, existingNode ) ; } } Index: /FCKeditor/branches/features/style/editor/_source/classes/fckdocumentfragment_ie.js =================================================================== --- /FCKeditor/branches/features/style/editor/_source/classes/fckdocumentfragment_ie.js (revision 757) +++ /FCKeditor/branches/features/style/editor/_source/classes/fckdocumentfragment_ie.js (revision 758) @@ -56,4 +56,13 @@ while( ( eLast = eRoot.lastChild ) ) FCKDomTools.InsertAfterNode( existingNode, eRoot.removeChild( eLast ) ) ; + }, + + InsertBeforeNode : function( existingNode ) + { + var eRoot = this.RootNode ; + var eFirst ; + + while( ( eFirst = eRoot.firstChild ) ) + existingNode.parentNode.insertBefore( eRoot.removeChild( eFirst ), existingNode ) ; } } ; Index: /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange.js =================================================================== --- /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange.js (revision 757) +++ /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange.js (revision 758) @@ -34,13 +34,17 @@ _UpdateElementInfo : function() { - if ( !this._Range ) + var innerRange = this._Range ; + + if ( !innerRange ) this.Release( true ) ; else { - var eStart = this._Range.startContainer ; - var eEnd = this._Range.endContainer ; + // For text nodes, the node itself is the StartNode. + var eStart = innerRange.startContainer ; + var eEnd = innerRange.endContainer ; var oElementPath = new FCKElementPath( eStart ) ; - this.StartContainer = oElementPath.LastElement ; + this.StartNode = eStart.nodeType == 3 ? eStart : eStart.childNodes[ innerRange.startOffset ] ; + this.StartContainer = eStart ; this.StartBlock = oElementPath.Block ; this.StartBlockLimit = oElementPath.BlockLimit ; @@ -48,5 +52,6 @@ if ( eStart != eEnd ) oElementPath = new FCKElementPath( eEnd ) ; - this.EndContainer = oElementPath.LastElement ; + this.EndNode = eEnd.nodeType == 3 ? eEnd : eEnd.childNodes[ innerRange.endOffset ] ; + this.EndContainer = eEnd ; this.EndBlock = oElementPath.Block ; this.EndBlockLimit = oElementPath.BlockLimit ; @@ -215,11 +220,18 @@ }, - CreateBookmark : function() + // This is an "intrusive" way to create a bookmark. It includes tags + // in the range boundaries. The advantage of it is that it is possible to + // handle DOM mutations when moving back to the bookmark. + // Attention: the inclusion of nodes in the DOM is a design choice and + // should not be changes as there are other points in the code that may be + // using those nodes to perform operations. See GetBookmarkNode. + // For performance, includeNodes=true if intended to SelectBookmark. + CreateBookmark : function( includeNodes ) { // Create the bookmark info (random IDs). var oBookmark = { - StartId : 'fck_dom_range_start_' + (new Date()).valueOf() + '_' + Math.floor(Math.random()*1000), - EndId : 'fck_dom_range_end_' + (new Date()).valueOf() + '_' + Math.floor(Math.random()*1000) + StartId : (new Date()).valueOf() + Math.floor(Math.random()*1000) + 'S', + EndId : (new Date()).valueOf() + Math.floor(Math.random()*1000) + 'E' } ; @@ -233,14 +245,27 @@ eSpan = oDoc.createElement( 'span' ) ; eSpan.id = oBookmark.EndId ; - eSpan.innerHTML = ' ' ; // For IE, it must have something inside, otherwise it may be removed during operations. + eSpan.setAttribute( '_fck_bookmark', true ) ; + + // For IE, it must have something inside, otherwise it may be + // removed during DOM operations. +// if ( FCKBrowserInfo.IsIE ) + eSpan.innerHTML = ' ' ; oClone = this.Clone() ; oClone.Collapse( false ) ; oClone.InsertNode( eSpan ) ; + + if ( includeNodes ) + oBookmark.EndNode = eSpan ; } eSpan = oDoc.createElement( 'span' ) ; eSpan.id = oBookmark.StartId ; - eSpan.innerHTML = ' ' ; // For IE, it must have something inside, otherwise it may be removed during operations. + eSpan.setAttribute( '_fck_bookmark', true ) ; + + // For IE, it must have something inside, otherwise it may be removed + // during DOM operations. +// if ( FCKBrowserInfo.IsIE ) + eSpan.innerHTML = ' ' ; oClone = this.Clone() ; @@ -248,13 +273,25 @@ oClone.InsertNode( eSpan ) ; + if ( includeNodes ) + oBookmark.StartNode = eSpan ; + return oBookmark ; }, + // This one should be a part of a hypothetic "bookmark" object. + GetBookmarkNode : function( bookmark, start ) + { + var doc = this.Window.document ; + + if ( start ) + return bookmark.StartNode || doc.getElementById( bookmark.StartId ) ; + else + return bookmark.EndNode || doc.getElementById( bookmark.EndId ) ; + }, + MoveToBookmark : function( bookmark, preserveBookmark ) { - var oDoc = this.Window.document ; - - var eStartSpan = oDoc.getElementById( bookmark.StartId ) ; - var eEndSpan = oDoc.getElementById( bookmark.EndId ) ; + var eStartSpan = this.GetBookmarkNode( bookmark, true ) ; + var eEndSpan = this.GetBookmarkNode( bookmark, false ) ; this.SetStart( eStartSpan, 3 ) ; @@ -263,5 +300,5 @@ FCKDomTools.RemoveNode( eStartSpan ) ; - // If collapsed, the start span will not be available. + // If collapsed, the end span will not be available. if ( eEndSpan ) { @@ -284,7 +321,7 @@ if ( ! this._Range ) return { "Start" : 0, "End" : 0 } ; - + // First, we record down the offset values - var bookmark = + var bookmark = { "Start" : [ this._Range.startOffset ], @@ -424,4 +461,51 @@ switch ( unit ) { + // Expand the range to include all inline parent elements if we are + // are in their boundary limits. + // For example (where [ ] are the range limits): + // Before => Some [Some sample text]. + // After => Some [Some sample text]. + case 'inline_elements' : + // Expand the start boundary. + if ( this._Range.startOffset == 0 ) + { + oNode = this._Range.startContainer ; + + if ( oNode.nodeType != 1 ) + oNode = oNode.parentNode ; + + while ( FCKListsLib.InlineNonEmptyElements[ oNode.nodeName.toLowerCase() ] ) + { + this._Range.setStartBefore( oNode ) ; + + if ( oNode != oNode.parentNode.firstChild ) + break ; + + oNode = oNode.parentNode ; + } + } + + // Expand the end boundary. + oNode = this._Range.endContainer ; + var offset = this._Range.endOffset ; + + if ( ( oNode.nodeType == 3 && offset >= oNode.nodeValue.length ) || ( oNode.nodeType == 1 && offset >= oNode.childNodes.length ) || ( oNode.nodeType != 1 && oNode.nodeType != 3 ) ) + { + if ( oNode.nodeType != 1 ) + oNode = oNode.parentNode ; + + while ( FCKListsLib.InlineNonEmptyElements[ oNode.nodeName.toLowerCase() ] ) + { + this._Range.setEndAfter( oNode ) ; + + if ( oNode != oNode.parentNode.lastChild ) + break ; + + oNode = oNode.parentNode ; + } + } + + break ; + case 'block_contents' : if ( this.StartBlock ) @@ -531,10 +615,10 @@ if ( !eStartBlock ) { - eStartBlock = this._FixBlock( true ) ; - eEndBlock = this.EndBlock ; // _FixBlock may have fixed the EndBlock too. + eStartBlock = this.FixBlock( true ) ; + eEndBlock = this.EndBlock ; // FixBlock may have fixed the EndBlock too. } if ( !eEndBlock ) - eEndBlock = this._FixBlock( false ) ; + eEndBlock = this.FixBlock( false ) ; } @@ -546,5 +630,5 @@ this.DeleteContents() ; - if ( eStartBlock && eEndBlock && eStartBlock == eEndBlock ) + if ( eStartBlock && eEndBlock && eStartBlock == eEndBlock ) { if ( bIsStartOfBlock ) @@ -596,5 +680,5 @@ // Transform a block without a block tag in a valid block (orphan text in the body or td, usually). - _FixBlock : function( isStart ) + FixBlock : function( isStart ) { // Bookmark the range so we can restore it later. @@ -628,11 +712,18 @@ this.Window = null ; + this.StartNode = null ; this.StartContainer = null ; this.StartBlock = null ; this.StartBlockLimit = null ; + this.EndNode = null ; this.EndContainer = null ; this.EndBlock = null ; this.EndBlockLimit = null ; this._Range = null ; + }, + + CheckHasRange : function() + { + return ( this._Range && true ) ; } } ; Index: /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange_gecko.js =================================================================== --- /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange_gecko.js (revision 757) +++ /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange_gecko.js (revision 758) @@ -72,2 +72,25 @@ } } + +// Not compatible with bookmark created with CreateBookmark2. +// The bookmark nodes will be deleted from the document. +FCKDomRange.prototype.SelectBookmark = function( bookmark ) +{ + var domRange = this.Window.document.createRange() ; + + var startNode = this.GetBookmarkNode( bookmark, true ) ; + var endNode = this.GetBookmarkNode( bookmark, false ) ; + + domRange.setStart( startNode.parentNode, FCKDomTools.GetIndexOf( startNode ) ) ; + FCKDomTools.RemoveNode( startNode ) ; + + if ( endNode ) + { + domRange.setEnd( endNode.parentNode, FCKDomTools.GetIndexOf( endNode ) ) ; + FCKDomTools.RemoveNode( endNode ) ; + } + + var selection = this.Window.getSelection() ; + selection.removeAllRanges() ; + selection.addRange( domRange ) ; +} Index: /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange_ie.js =================================================================== --- /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange_ie.js (revision 757) +++ /FCKeditor/branches/features/style/editor/_source/classes/fckdomrange_ie.js (revision 758) @@ -70,73 +70,85 @@ { if ( this._Range ) - { - var bIsCollapsed = this.CheckIsCollapsed() ; + this.SelectBookmark( this.CreateBookmark( true ) ) ; +} - // Create marker tags for the start and end boundaries. - var eStartMarker = this._GetRangeMarkerTag( true ) ; +// Not compatible with bookmark created with CreateBookmark2. +// The bookmark nodes will be deleted from the document. +FCKDomRange.prototype.SelectBookmark = function( bookmark ) +{ + var bIsCollapsed = this.CheckIsCollapsed() ; var bIsStartMakerAlone ; - if ( !bIsCollapsed ) - var eEndMarker = this._GetRangeMarkerTag( false ) ; + // Create marker tags for the start and end boundaries. + var eStartMarker = this.GetBookmarkNode( bookmark, true ) ; + + if ( !eStartMarker ) + return ; - // Create the main range which will be used for the selection. - var oIERange = this.Window.document.body.createTextRange() ; + var eEndMarker ; + if ( !bIsCollapsed ) + eEndMarker = this.GetBookmarkNode( bookmark, false ) ; - // Position the range at the start boundary. - oIERange.moveToElementText( eStartMarker ) ; - oIERange.moveStart( 'character', 1 ) ; + // Create the main range which will be used for the selection. + var oIERange = this.Window.document.body.createTextRange() ; - if ( !bIsCollapsed ) + // Position the range at the start boundary. + oIERange.moveToElementText( eStartMarker ) ; + oIERange.moveStart( 'character', 1 ) ; + + if ( eEndMarker ) + { + // Create a tool range for the end. + var oIERangeEnd = this.Window.document.body.createTextRange() ; + + // Position the tool range at the end. + oIERangeEnd.moveToElementText( eEndMarker ) ; + + // Move the end boundary of the main range to match the tool range. + oIERange.setEndPoint( 'EndToEnd', oIERangeEnd ) ; + oIERange.moveEnd( 'character', -1 ) ; + } + else + bIsStartMakerAlone = ( !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ; + + if ( !this._Range ) + this._Range = this.CreateRange() ; + + // Remove the markers (reset the position, because of the changes in the DOM tree). + this._Range.setStartBefore( eStartMarker ) ; + eStartMarker.parentNode.removeChild( eStartMarker ) ; + + if ( bIsCollapsed ) + { + if ( bIsStartMakerAlone ) { - // Create a tool range for the end. - var oIERangeEnd = this.Window.document.body.createTextRange() ; + // The following trick is needed so IE makes collapsed selections + // inside empty blocks visible (expands the block). - // Position the tool range at the end. - oIERangeEnd.moveToElementText( eEndMarker ) ; + try + { + oIERange.pasteHTML( ' ' ) ; + + // Move the selection start to include the  . + oIERange.moveStart( 'character', -1 ) ; + } + catch (e){} - // Move the end boundary of the main range to match the tool range. - oIERange.setEndPoint( 'EndToEnd', oIERangeEnd ) ; - oIERange.moveEnd( 'character', -1 ) ; + // The following must be done into a separate try block. (#1034) + try + { + oIERange.select() ; + this.Window.document.selection.clear() ; + } + catch (e){} } else - bIsStartMakerAlone = ( !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ; - - // Remove the markers (reset the position, because of the changes in the DOM tree). - this._Range.setStartBefore( eStartMarker ) ; - eStartMarker.parentNode.removeChild( eStartMarker ) ; - - if ( bIsCollapsed ) - { - if ( bIsStartMakerAlone ) - { - // The following trick is needed so IE makes collapsed selections - // inside empty blocks visible (expands the block). - - try - { - oIERange.pasteHTML( ' ' ) ; - - // Move the selection start to include the  . - oIERange.moveStart( 'character', -1 ) ; - } - catch (e){} - - // The following must be done into a separate try block. (#1034) - try - { - oIERange.select() ; - this.Window.document.selection.clear() ; - } - catch (e){} - } - else - oIERange.select() ; - } - else - { - this._Range.setEndBefore( eEndMarker ) ; - eEndMarker.parentNode.removeChild( eEndMarker ) ; oIERange.select() ; - } + } + else + { + this._Range.setEndBefore( eEndMarker ) ; + eEndMarker.parentNode.removeChild( eEndMarker ) ; + oIERange.select() ; } } @@ -175,22 +187,2 @@ return doc.getElementById( sMarkerId ) ; } - -FCKDomRange.prototype._GetRangeMarkerTag = function( toStart ) -{ - // Get a range for the start boundary. - var oRange = this._Range ; - - // insertNode() will add the node at the beginning of the Range, updating - // the endOffset if necessary. So, we can work with the current range in this case. - if ( !toStart ) - { - oRange = oRange.cloneRange() ; - oRange.collapse( toStart === true ) ; - } - - var eSpan = this.Window.document.createElement( 'span' ) ; - eSpan.innerHTML = ' ' ; - oRange.insertNode( eSpan ) ; - - return eSpan ; -} Index: /FCKeditor/branches/features/style/editor/_source/classes/fckspecialcombo.js =================================================================== --- /FCKeditor/branches/features/style/editor/_source/classes/fckspecialcombo.js (revision 757) +++ /FCKeditor/branches/features/style/editor/_source/classes/fckspecialcombo.js (revision 758) @@ -117,13 +117,13 @@ } -FCKSpecialCombo.prototype.SelectItem = function( itemId ) -{ - itemId = itemId ? itemId.toString().toLowerCase() : '' ; - - var oDiv = this.Items[ itemId ] ; - if ( oDiv ) - { - oDiv.className = oDiv.originalClass = 'SC_ItemSelected' ; - oDiv.Selected = true ; +FCKSpecialCombo.prototype.SelectItem = function( item ) +{ + if ( typeof item == 'string' ) + item = this.Items[ item.toString().toLowerCase() ] + + if ( item ) + { + item.className = item.originalClass = 'SC_ItemSelected' ; + item.Selected = true ; } } Index: /FCKeditor/branches/features/style/editor/_source/classes/fckstyle.js =================================================================== --- /FCKeditor/branches/features/style/editor/_source/classes/fckstyle.js (revision 758) +++ /FCKeditor/branches/features/style/editor/_source/classes/fckstyle.js (revision 758) @@ -0,0 +1,1121 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKStyle Class: contains a style definition, and all methods to work with + * the style in a document. + */ + +/** + * @param {Object} styleDesc A "style descriptor" object, containing the raw + * style definition in the following format: + * ' + + + + + + - - - -