Ticket #2751: 2751.patch

_source/plugins/elementspath/plugin.js

@@ -78 +78 @@
 
                                         while ( element )
                                         {
-                                                var index = elementsList.push( element ) - 1,
+                                                var index = elementsList.push( element ) - 1;
+                                                var name;
+                                                if ( element.getAttribute( '_cke_real_element_type' ) )
+                                                        name = element.getAttribute( '_cke_real_element_type' );
+                                                else
                                                         name = element.getName();
 
                                                 // Use this variable to add conditional stuff to the

_source/plugins/fakeobjects/plugin.js

@@ -45 +45 @@
                                                 {
                                                         match : function( nodeName, attributes )
                                                         {
+                                                                return ( nodeName == 'a' && attributes.name != null && attributes.name != '' );
+                                                        },
+                                                        cssClass : 'anchor',
+                                                        priority : 10
+                                                },
+                                                {
+                                                        match : function( nodeName, attributes )
+                                                        {
                                                                 return nodeName == 'embed' || nodeName == 'object';
                                                         },
                                                         cssClass : 'object',
@@ -129 +137 @@
 
                                                 // Get the fake element's CSS class.
                                                 var cssClass = 'unknown';
+                                                var realElementType = element.getName();
                                                 for ( var i = 0 ; i < objectTypes.length ; i++ )
                                                 {
                                                         if ( objectTypes[i].match( element.getName(), element.$ ) )
                                                         {
                                                                 cssClass = '_cke_fakeobject' + ' ' + objectTypes[i].cssClass;
+                                                                realElementType = objectTypes[i].cssClass;
                                                                 break;
                                                         }
                                                 }
@@ -150 +160 @@
                                                 if ( heightMatch )
                                                         fakeRawElement.style.height = heightMatch[1] + 'px';
                                                 fakeRawElement.setAttribute( '_cke_protected_html', encodeURIComponent( html ) );
+                                                fakeRawElement.setAttribute( '_cke_real_element_type', realElementType );
                                                 return new CKEDITOR.dom.element( fakeRawElement );
                                         },
 
@@ -264 +275 @@
                                                 parser.parse( html );
                                                 return processedHtml.join( '' );
                                         },
+                                        /**
+                                         * Updates HTML into a placeholder
+                                         * @param {CKEDITOR.dom.element} fakeImgElement The placeholder &lt;img&gt;.
+                                         * @param {CKEDITOR.dom.element} element Input DOM element.
+                                         * @returns {String} encoded HTML.
+                                         * @example
+                                         */
+                                        updateFakeElement : function( fakeElement, realElement )
+                                        {
+                                                var $ = realElement.$.cloneNode( true ),
+                                                        doc = $.ownerDocument,
+                                                        temp = doc.createElement( 'div' ),
+                                                        html;
 
+                                                // Get the object's HTML code.
+                                                temp.appendChild( $ );
+                                                html = temp.innerHTML;
+                                                fakeElement.setAttribute( '_cke_protected_html', encodeURIComponent( html ) );
+                                                return html;
+                                        },
+                                        
                                         /**
                                          * Restores placeholders in an HTML string back to their original elements.
                                          * @param {String} html HTML with placeholders.

_source/plugins/link/dialogs/anchor.js

@@ -55 +55 @@
                                 // It doesn't work with IE.
                                 this.restoreSelection();
                                 this.clearSavedSelection();
-                                editor.insertElement( this.editObj );
+
+                                var fakeElement = CKEDITOR.plugins.fakeobjects.protectElement( this.editObj );
+                                editor.insertElement( fakeElement );
                         }
+                        else
+                                CKEDITOR.plugins.fakeobjects.updateFakeElement( this.fakeObj, this.editObj );
                         return true;
                 },
                 onShow : function()
                 {
                         this.editObj = false;
+                        this.fakeObj = false;
                         this.editMode = false;
 
                         // IE BUG: Selection must be in the editor for getSelection() to work.
@@ -75 +80 @@
                         {
                                 ranges[0].enlarge( CKEDITOR.ENLARGE_ELEMENT );
                                 rangeRoot = ranges[0].getCommonAncestor( true );
-                                var element = rangeRoot.getAscendant( 'a', true );
-                                if ( element && element.getAttribute( 'name' ) )
+                                var element = rangeRoot.getAscendant( 'img', true );
+                                if ( element && element.getAttribute( '_cke_real_element_type' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
                                 {
+                                        this.fakeObj = element;
+                                        element = CKEDITOR.plugins.fakeobjects.restoreElement( this.fakeObj );
                                         loadElements.apply( this, [ editor, selection, ranges, element ] );
-                                        selection.selectElement( element );
+                                        selection.selectElement( this.fakeObj );
                                         this.saveSelection();
                                 }
                         }

_source/skins/default/toolbar.css

@@ -257 +257 @@
         background-position: 0 -656px;
 }
 
+.cke_skin_default a.cke_button_pagebreak .cke_icon
+{
+        background-position: 0 -672px;
+}
+
 .cke_skin_default a.cke_button_form .cke_icon
 {
         background-position: 0 -752px;

contents.css

@@ -47 +47 @@
 {
         background-image: url(images/plugin.gif);
 }
+
+img._cke_fakeobject.anchor
+{
+        background-image: url(images/anchor.gif);
+        width: 18px;
+        height: 18px;
+}