Ticket #2860: 2860.patch

_source/core/config.js

@@ -146 +146 @@
          * @example
          * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
          */
-        plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,removeformat,smiley,sourcearea,specialchar,tab,toolbar,wysiwygarea',
+        plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,removeformat,smiley,sourcearea,specialchar,tab,toolbar,wysiwygarea',
 
         /**
          * The theme to be used to build the UI.

_source/core/dom/element.js

@@ -259 +259 @@
                         return this.$.innerHTML;
                 },
 
+                getOuterHtml : function()
+                {
+                        if ( this.$.outerHTML )
+                                return this.$.outerHTML;
+                        
+                        var tmpDiv = this.$.ownerDocument.createElement( 'div' );
+                        tmpDiv.appendChild( this.$.cloneNode( true ) );
+                        return tmpDiv.innerHTML;
+                },
+
                 /**
                  * Sets the inner HTML of this element.
                  * @param {String} html The HTML to be set for this element.
@@ -563 +573 @@
                         return $ ? new CKEDITOR.dom.node( $ ) : null;
                 },
 
+                getStyle : function( name )
+                {
+                        return this.$.style[ CKEDITOR.tools.cssStyleToDomStyle( name ) ];
+                },
+
                 /**
                  * Checks if the element name matches one or more names.
                  * @param {String} name[,name[,...]] One or more names to be checked.

_source/core/dom/node.js

@@ -416 +416 @@
                         }
 
                         return this;
+                },
+
+                replace : function( nodeToReplace )
+                {
+                        this.insertBefore( nodeToReplace );
+                        nodeToReplace.remove();
                 }
         }
 );

_source/core/editor.js

@@ -264 +264 @@
                         delete this._.instanceConfig;
 
                         this._.commands = {};
+                        this._.styles = [];
 
                         /**
                          * The DOM element that has been replaced by this editor instance. This
@@ -348 +349 @@
                         this._.commands[ commandName ] = new CKEDITOR.command( this, commandDefinition );
                 },
 
+                addCss : function( css )
+                {
+                        this._.styles.push( css );
+                },
+
                 /**
                  * Destroys the editor instance, releasing all resources used by it.
                  * If the editor replaced an element, the element will be recovered.

_source/core/htmlparser/element.js

@@ -13 +13 @@
  */
 CKEDITOR.htmlParser.element = function( name, attributes )
 {
+        if ( attributes._cke_saved_src )
+                attributes.src = attributes._cke_saved_src;
+
+        if ( attributes._cke_saved_href )
+                attributes.href = attributes._cke_saved_href;
+
         /**
          * The element name.
          * @type String
@@ -97 +103 @@
                  */
                 writeHtml : function( writer )
                 {
+                        var attributes = this.attributes;
+                        
+                        // The "_cke_realelement" attribute indicates that the current
+                        // element is a placeholder for another element.
+                        if ( attributes._cke_realelement )
+                        {
+                                var realFragment = new CKEDITOR.htmlParser.fragment.fromHtml( decodeURIComponent( attributes._cke_realelement ) );
+                                realFragment.writeHtml( writer );
+                                return;
+                        }
+                        
+                        // The "_cke_replacedata" indicates that this element is replacing
+                        // a data snippet, which should be outputted as is.
+                        if ( attributes._cke_replacedata )
+                        {
+                                writer.write( attributes._cke_replacedata );
+                                return;
+                        }
+                
                         // Open element tag.
                         writer.openTag( this.name, this.attributes );
 
                         // Copy all attributes to an array.
                         var attribsArray = [];
-                        for ( var a in this.attributes )
-                                attribsArray.push( [ a, this.attributes[ a ] ] );
+                        for ( var a in attributes )
+                        {
+                                // Ignore all attributes starting with "_cke".
+                                if ( !/^_cke/.test( a ) )
+                                        attribsArray.push( [ a, this.attributes[ a ] ] );
+                        }
 
                         // Sort the attributes by name.
                         attribsArray.sort( sortAttribs );
@@ -112 +141 @@
                         for ( var i = 0, len = attribsArray.length ; i < len ; i++ )
                         {
                                 var attrib = attribsArray[ i ];
-                                // IE's treated expand fields as dom attributes, skip it
-                                if ( CKEDITOR.env.ie && attrib === '_cke_expando' )
-                                        continue;
                                 writer.attribute( attrib[0], attrib[1] );
                         }
 

_source/plugins/htmlwriter/plugin.js

@@ -225 +225 @@
         /**
          * Writes the current indentation chars. It uses the
          * {@link #indentationChars} property, repeating it for the current
-         * intentation steps.
+         * indentation steps.
          * @example
          * // Writes "\t" (e.g.).
          * writer.indentation();
@@ -237 +237 @@
         },
 
         /**
+         * Writes any kind of data to the ouput.
+         * @example
+         * writer.write( 'This is an <b>example</b>.' );
+         */
+        write : function( data )
+        {
+                this._.output.push( data );
+        },
+
+        /**
          * Empties the current output buffer.
          * @example
          * writer.reset();

_source/plugins/toolbar/plugin.js

@@ -211 +211 @@
                 'Bold', 'Italic', 'Underline', 'Strike', '-',
                 'Subscript', 'Superscript', '-',
                 'SelectAll', 'RemoveFormat', '-',
-                'Smiley', 'HorizontalRule', 'SpecialChar'
+                'Smiley', 'HorizontalRule', 'SpecialChar', 'PageBreak'
         ]
 ];

_source/plugins/wysiwygarea/plugin.js

@@ -44 +44 @@
         // #### protectEvents - END
 
         // #### protectAttributes - START
+        
+        // TODO: Clean and simplify these regexes.
         var protectUrlTagRegex = /<(?:a|area|img)(?=\s).*?\s(?:href|src)=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,
-                protectUrlAttributeRegex = /\s(href|src)(\s*=\s*?('|")[\s\S]*?\3)/gi,
-                protectedUrlTagRegex = /<(?:a|area|img)(?=\s)(?:"[^"]*"|'[^']*'|[^<])*>/gi,
-                protectedAttributeRegex = /_cke_saved_/gi,
-                protectUrls = function( html )
-                {
-                        return html.replace( protectUrlTagRegex, protectUrls_ReplaceTags );
-                },
-                protectUrls_ReplaceTags = function( tagMatch )
-                {
-                        return tagMatch.replace( protectUrlAttributeRegex, '$& _cke_saved_$1$2');
-                },
-                protectUrlsRestore = function( html )
-                {
-                        return html.replace( protectedUrlTagRegex, protectUrlsRestore_ReplaceTags );
-                },
-                protectUrlsRestore_ReplaceTags = function( tagMatch )
-                {
-                        return tagMatch.replace( protectUrlAttributeRegex, '' ).replace( protectedAttributeRegex, '' );
-                };
+                protectUrlAttributeRegex = /\s(href|src)(\s*=\s*?('|")[\s\S]*?\3)/gi;
+        
+        var protectUrls = function( html )
+        {
+                return html.replace( protectUrlTagRegex, protectUrls_ReplaceTags );
+        };
+
+        var protectUrls_ReplaceTags = function( tagMatch )
+        {
+                return tagMatch.replace( protectUrlAttributeRegex, '$& _cke_saved_$1$2');
+        };
+
         // #### protectAttributes - END
 
         var onInsertHtml = function( evt )
@@ -300 +295 @@
                                                                 // Protect src or href attributes.
                                                                 data = protectUrls( data );
 
-                                                                // Replace tags with fake elements.
-                                                                if ( editor.fakeobjects )
-                                                                        data = editor.fakeobjects.protectHtml( data );
-
                                                                 data =
                                                                         editor.config.docType +
                                                                         '<html dir="' + editor.config.contentsLangDirection + '">' +
                                                                         '<head>' +
                                                                                 '<link href="' + editor.config.contentsCss + '" type="text/css" rel="stylesheet" _fcktemp="true"/>' +
+                                                                                '<style type="text/css" _fcktemp="true">' +
+                                                                                        editor._.styles.join( '\n' ) +
+                                                                                '</style>'+
                                                                         '</head>' +
                                                                         '<body>' +
                                                                                 data +
@@ -356 +350 @@
                                                                 // Restore protected attributes.
                                                                 data = protectEventsRestore( data );
 
-                                                                // Restore protected URLs.
-                                                                data = protectUrlsRestore( data );
-
-                                                                // Restore fake elements.
-                                                                if ( editor.fakeobjects )
-                                                                        data = editor.fakeobjects.restoreHtml( data );
-
                                                                 return data;
                                                         },
 

contents.css

@@ -12 +12 @@
         /* Remove the background color to make it transparent */
         background-color: #fff;
 }
-
-/* The following declarations are to be removed from this file (#2786) */
-
-img.cke_fakeobject
-{
-        background-position: center center;
-        background-repeat: no-repeat;
-        border: 1px solid #a9a9a9;
-        width: 80px;
-        height: 80px;
-}
-
-img.cke_fakeobject.flash
-{
-        background-image: url(images/flashlogo.gif);
-}
-
-img.cke_fakeobject.object
-{
-        background-image: url(images/plugin.gif);
-}
-
-img.cke_fakeobject.anchor
-{
-        background-image: url(images/anchor.gif);
-        width: 18px;
-        height: 18px;
-}
-
-img.cke_fakeobject.pagebreak
-{
-        background-image: url(images/pagebreak.gif);
-        width: 100%;
-        height: 7px;
-}