Ticket #6097: 6097.patch

_source/core/dom/element.js

@@ -789 +789 @@
                         {
                                 var child = children.getItem( i );
 
-                                if ( child.type == CKEDITOR.NODE_ELEMENT && child.getAttribute( '_fck_bookmark' ) )
+                                if ( child.type == CKEDITOR.NODE_ELEMENT && child.getAttribute( '_cke_bookmark' ) )
                                         continue;
 
                                 if ( child.type == CKEDITOR.NODE_ELEMENT && !child.isEmptyInlineRemoveable()
@@ -917 +917 @@
                                         // queuing them to be moved later. (#5567)
                                         var pendingNodes = [];
 
-                                        while ( sibling.getAttribute( '_fck_bookmark' )
+                                        while ( sibling.getAttribute( '_cke_bookmark' )
                                                 || sibling.isEmptyInlineRemoveable() )
                                         {
                                                 pendingNodes.push( sibling );

_source/core/dom/range.js

@@ -305 +305 @@
                 return node.type != CKEDITOR.NODE_TEXT
                             && node.getName() in CKEDITOR.dtd.$removeEmpty
                             || !CKEDITOR.tools.trim( node.getText() )
-                            || node.getParent().hasAttribute( '_fck_bookmark' );
+                            || node.getParent().hasAttribute( '_cke_bookmark' );
         }
 
         var whitespaceEval = new CKEDITOR.dom.walker.whitespaces(),
@@ -399 +399 @@
                         var clone;
 
                         startNode = this.document.createElement( 'span' );
-                        startNode.setAttribute( '_fck_bookmark', 1 );
+                        startNode.setAttribute( '_cke_bookmark', 1 );
                         startNode.setStyle( 'display', 'none' );
 
                         // For IE, it must have something inside, otherwise it may be
@@ -705 +705 @@
                                 endNode = this.endContainer;
 
                         if ( startNode.is && startNode.is( 'span' )
-                                && startNode.hasAttribute( '_fck_bookmark' ) )
+                                && startNode.hasAttribute( '_cke_bookmark' ) )
                                 this.setStartAt( startNode, CKEDITOR.POSITION_BEFORE_START );
                         if ( endNode && endNode.is && endNode.is( 'span' )
-                                && endNode.hasAttribute( '_fck_bookmark' ) )
+                                && endNode.hasAttribute( '_cke_bookmark' ) )
                                 this.setEndAt( endNode,  CKEDITOR.POSITION_AFTER_END );
                 },
 
@@ -914 +914 @@
                                                                 // If this is a visible element.
                                                                 // We need to check for the bookmark attribute because IE insists on
                                                                 // rendering the display:none nodes we use for bookmarks. (#3363)
-                                                                if ( sibling.$.offsetWidth > 0 && !sibling.getAttribute( '_fck_bookmark' ) )
+                                                                if ( sibling.$.offsetWidth > 0 && !sibling.getAttribute( '_cke_bookmark' ) )
                                                                 {
                                                                         // We'll accept it only if we need
                                                                         // whitespace, and this is an inline
@@ -1073 +1073 @@
                                                                 // If this is a visible element.
                                                                 // We need to check for the bookmark attribute because IE insists on
                                                                 // rendering the display:none nodes we use for bookmarks. (#3363)
-                                                                if ( sibling.$.offsetWidth > 0 && !sibling.getAttribute( '_fck_bookmark' ) )
+                                                                if ( sibling.$.offsetWidth > 0 && !sibling.getAttribute( '_cke_bookmark' ) )
                                                                 {
                                                                         // We'll accept it only if we need
                                                                         // whitespace, and this is an inline

_source/core/dom/walker.js

@@ -374 +374 @@
                 {
                         return ( node && node.getName
                                         && node.getName() == 'span'
-                                        && node.hasAttribute('_fck_bookmark') );
+                                        && node.hasAttribute('_cke_bookmark') );
                 }
 
                 return function( node )

_source/plugins/styles/plugin.js

@@ -407 +407 @@
                                 var nodeType = currentNode.type;
                                 var nodeName = nodeType == CKEDITOR.NODE_ELEMENT ? currentNode.getName() : null;
 
-                                if ( nodeName && currentNode.getAttribute( '_fck_bookmark' ) )
+                                if ( nodeName && currentNode.getAttribute( '_cke_bookmark' ) )
                                 {
                                         currentNode = currentNode.getNextSourceNode( true );
                                         continue;
@@ -813 +813 @@
         {
                 // Exclude the ones at header OR at tail,
                 // and ignore bookmark content between them.
-                var duoBrRegex = /(\S\s*)\n(?:\s|(<span[^>]+_fck_bookmark.*?\/span>))*\n(?!$)/gi,
+                var duoBrRegex = /(\S\s*)\n(?:\s|(<span[^>]+_cke_bookmark.*?\/span>))*\n(?!$)/gi,
                         blockName = preBlock.getName(),
                         splitedHtml = replace( preBlock.getOuterHtml(),
                                 duoBrRegex,
@@ -835 +835 @@
                 var headBookmark = '',
                         tailBookmark = '';
 
-                str = str.replace( /(^<span[^>]+_fck_bookmark.*?\/span>)|(<span[^>]+_fck_bookmark.*?\/span>$)/gi,
+                str = str.replace( /(^<span[^>]+_cke_bookmark.*?\/span>)|(<span[^>]+_cke_bookmark.*?\/span>$)/gi,
                         function( str, m1, m2 ){
                                         m1 && ( headBookmark = m1 );
                                         m2 && ( tailBookmark = m2 );