Ticket #1694: 1694.patch

editor/_source/classes/fckcontextmenu.js

@@ -123 +123 @@
                         var overrideButton = FCKContextMenu_OverrideButton ;
                         if( !overrideButton )
                         {
-                                var doc = e.target.ownerDocument ;
+                                var doc = FCKTools.GetElementDocument( e.target ) ;
                                 overrideButton = FCKContextMenu_OverrideButton = doc.createElement('input') ;
                                 overrideButton.type = 'button' ;
                                 var buttonHolder = doc.createElement('p') ;

editor/_source/classes/fckenterkey.js

@@ -420 +420 @@
                         // We'll need to append a placeholder or the list item wouldn't be editable. (Bug #1420)
                         if ( eNextBlock.nodeName.IEquals( 'li' ) && eNextBlock.firstChild
                                         && eNextBlock.firstChild.nodeName.IEquals( ['ul', 'ol'] ) )
-                                eNextBlock.insertBefore( eNextBlock.ownerDocument.createTextNode( '\xa0' ), eNextBlock.firstChild ) ;
+                                eNextBlock.insertBefore( FCKTools.GetElementDocument( eNextBlock ).createTextNode( '\xa0' ), eNextBlock.firstChild ) ;
                         // Move the selection to the end block.
                         if ( eNextBlock )
                                 oRange.MoveToElementEditStart( eNextBlock ) ;

editor/_source/commandclasses/fckblockquotecommand.js

@@ -126 +126 @@
                                 block = tmp.shift() ;
                                 if ( block.nodeName.IEquals( 'blockquote' ) )
                                 {
-                                        var docFrag = block.ownerDocument.createDocumentFragment() ;
+                                        var docFrag = FCKTools.GetElementDocument( block ).createDocumentFragment() ;
                                         while ( block.firstChild )
                                         {
                                                 docFrag.appendChild( block.removeChild( block.firstChild ) ) ;
@@ -203 +203 @@
                                         var firstTime = true ;
                                         if ( node.nodeName.IEquals( 'div' ) )
                                         {
-                                                var docFrag = node.ownerDocument.createDocumentFragment() ;
+                                                var docFrag = FCKTools.GetElementDocument( node ).createDocumentFragment() ;
                                                 var needBeginBr = firstTime && node.previousSibling && 
                                                         !FCKListsLib.BlockBoundaries[node.previousSibling.nodeName.toLowerCase()] ;
                                                 if ( firstTime && needBeginBr )
-                                                        docFrag.appendChild( node.ownerDocument.createElement( 'br' ) ) ;
+                                                        docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
                                                 var needEndBr = node.nextSibling && 
                                                         !FCKListsLib.BlockBoundaries[node.nextSibling.nodeName.toLowerCase()] ;
                                                 while ( node.firstChild )
                                                         docFrag.appendChild( node.removeChild( node.firstChild ) ) ;
                                                 if ( needEndBr )
-                                                        docFrag.appendChild( node.ownerDocument.createElement( 'br' ) ) ;
+                                                        docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
                                                 node.parentNode.replaceChild( docFrag, node ) ;
                                                 firstTime = false ;
                                         }

editor/_source/commandclasses/fcklistcommands.js

@@ -252 +252 @@
                         selectedListItems.push( itemNode ) ;
                         FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ;
                 }
-                var fakeParent = groupObj.root.ownerDocument.createElement( this.TagName ) ;
+                var fakeParent = FCKTools.GetElementDocument( groupObj.root ).createElement( this.TagName ) ;
                 for ( var i = 0 ; i < selectedListItems.length ; i++ )
                 {
                         var listIndex = selectedListItems[i]._FCK_ListArray_Index ;
@@ -270 +270 @@
         _CreateList : function( groupObj, listsCreated )
         {
                 var contents = groupObj.contents ;
-                var doc = groupObj.root.ownerDocument ;
+                var doc = FCKTools.GetElementDocument( groupObj.root ) ;
                 var listContents = [] ;
 
                 // It is possible to have the contents returned by DomRangeIterator to be the same as the root.

editor/_source/internals/fck.js

@@ -880 +880 @@
                                 var clearContents = false ;
                                 if ( !paddingNode.childNodes.firstChild )
                                 {
-                                        paddingNode.appendChild( paddingNode.ownerDocument.createTextNode( '\ufeff' ) ) ;
+                                        paddingNode.appendChild( FCKTools.GetElementDocument( paddingNode ).createTextNode( '\ufeff' ) ) ;
                                         clearContents = true ;
                                 }
                                 range.moveToElementText( paddingNode ) ;

editor/_source/internals/fckdomtools.js

@@ -609 +609 @@
         GetNodeAddress : function( node, normalized )
         {
                 var retval = [] ;
-                while ( node && node != node.ownerDocument.documentElement )
+                while ( node && node != FCKTools.GetElementDocument( node ).documentElement )
                 {
                         var parentNode = node.parentNode ;
                         var currentIndex = -1 ;
@@ -767 +767 @@
                         baseIndex = 0 ;
                 if ( ! listArray || listArray.length < baseIndex + 1 )
                         return null ;
-                var doc = listArray[baseIndex].parent.ownerDocument ;
+                var doc = FCKTools.GetElementDocument( listArray[baseIndex].parent ) ;
                 var retval = doc.createDocumentFragment() ;
                 var rootNode = null ;
                 var currentIndex = baseIndex ;
@@ -935 +935 @@
         GetPositionedAncestor : function( w, element )
         {
                 var currentElement = element ;
-                while ( currentElement != currentElement.ownerDocument.documentElement )
+                while ( currentElement != FCKTools.GetElementDocument( currentElement ).documentElement )
                 {
                         if ( this.GetCurrentElementStyle( w, currentElement, 'position' ) != 'static' )
                                 return currentElement ;

editor/_source/internals/fcktablehandler.js

@@ -366 +366 @@
 
         var baseColIdx = colIdx - selectionGeometry.x ;
         var baseRowIdx = rowIdx - selectionGeometry.y ;
-        var cellContents = refCell.ownerDocument.createDocumentFragment() ;
+        var cellContents = FCKTools.GetElementDocument( refCell ).createDocumentFragment() ;
         for ( var i = 0 ; i < selectionGeometry.height ; i++ ) 
         {
                 var rowChildNodesCount = 0 ;
@@ -385 +385 @@
                         }
                 }
                 if ( rowChildNodesCount > 0 )
-                        cellContents.appendChild( refCell.ownerDocument.createElement( 'br' ) ) ;
+                        cellContents.appendChild( FCKTools.GetElementDocument( refCell ).createElement( 'br' ) ) ;
         }
 
         this._ReplaceCellsByMarker( tableMap, '_SelectedCells', refCell ) ;
@@ -430 +430 @@
         var tableMap = target.tableMap ;
         var nextCell = target.nextCell ;
 
-        var cellContents = refCell.ownerDocument.createDocumentFragment() ;
+        var cellContents = FCKTools.GetElementDocument( refCell ).createDocumentFragment() ;
         while ( nextCell && nextCell.childNodes && nextCell.childNodes.length > 0 )
                 cellContents.appendChild( nextCell.removeChild( nextCell.firstChild ) ) ;
         if ( cellContents.firstChild )
-                cellContents.insertBefore( nextCell.ownerDocument.createElement( 'br' ), cellContents.firstChild ) ;
+                cellContents.insertBefore( FCKTools.GetElementDocument( nextCell ).createElement( 'br' ), cellContents.firstChild ) ;
         refCell.appendChild( cellContents ) ;
         this._MarkCells( [nextCell], '_Replace' ) ;
         this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
@@ -460 +460 @@
                 // Splittng a multi-column cell - original cell gets ceil(colSpan/2) columns,
                 // new cell gets floor(colSpan/2).
                 var newCellSpan = Math.ceil( cellSpan / 2 ) ;
-                var newCell = refCell.ownerDocument.createElement( 'td' ) ;
+                var newCell = FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ;
                 if ( FCKBrowserInfo.IsGeckoLike )
                         FCKTools.AppendBogusBr( newCell ) ;
                 var startIdx = colIdx + newCellSpan ;
@@ -488 +488 @@
                         if ( tableMap[i][colIdx] == refCell )
                         {
                                 newRow.push( refCell ) ;
-                                newRow.push( refCell.ownerDocument.createElement( 'td' ) ) ;
+                                newRow.push( FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ) ;
                                 if ( FCKBrowserInfo.IsGeckoLike )
                                         FCKTools.AppendBogusBr( newRow[newRow.length - 1] ) ;
                         }
@@ -755 +755 @@
         // Insert physical rows and columns to the table.
         for ( var i = 0 ; i < tableMap.length ; i++ )
         {
-                var rowObj = table.ownerDocument.createElement( 'tr' ) ;
+                var rowObj = FCKTools.GetElementDocument( table ).createElement( 'tr' ) ;
                 for ( var j = 0 ; j < tableMap[i].length ; )
                 {
                         var cell = tableMap[i][j] ;

editor/_source/internals/fckxhtml.js

@@ -27 +27 @@
 
 FCKXHtml.GetXHTML = function( node, includeNode, format )
 {
-        FCKDomTools.CheckAndRemovePaddingNode( node.ownerDocument, FCKConfig.EnterMode ) ;
+        FCKDomTools.CheckAndRemovePaddingNode( FCKTools.GetElementDocument( node ), FCKConfig.EnterMode ) ;
         FCKXHtmlEntities.Initialize() ;
 
         // Set the correct entity to use for empty blocks.

editor/plugins/dragresizetable/fckplugin.js

@@ -307 +307 @@
                 // We need to resolve the mouse pointer position relative to the editing area iframe.
                 var mouseX = evt.clientX ;
                 var mouseY = evt.clientY ;
-                if ( node.ownerDocument == document )
+                if ( FCKTools.GetElementDocument( node ) == document )
                 {
                         var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
                         mouseX -= offset.x ;
@@ -371 +371 @@
 
                 // Convert mouse coordinates in reference to the outer iframe.
                 var node = evt.srcElement || evt.target ;
-                if ( node.ownerDocument == FCK.EditorDocument )
+                if ( FCKTools.GetElementDocument( node ) == FCK.EditorDocument )
                 {
                         var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
                         mouse.x += offset.x ;