Ticket #2765: 2765.2.patch

_source/core/htmlparser/element.js

@@ -1 +1 @@
 /*
- * CKEditor - The text editor for Internet - http://ckeditor.com
- * Copyright (C) 2003-2008 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 ==
+ * CKEditor - The text editor for Internet - http://ckeditor.com Copyright (C) 2003-2008 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 ==
  */
 
 /**
  * A lightweight representation of an HTML element.
- * @param {String} name The element name.
- * @param {Object} attributes And object holding all attributes defined for
- *              this element.
+ * 
+ * @param {String}
+ *            name The element name.
+ * @param {Object}
+ *            attributes And object holding all attributes defined for this element.
  * @constructor
  * @example
  */
-CKEDITOR.htmlParser.element = function( name, attributes )
+CKEDITOR.htmlParser.element = function ( name, attributes )
 {
         /**
          * The element name.
+         * 
          * @type String
          * @example
          */
@@ -38 +30 @@
 
         /**
          * Holds the attributes defined for this element.
+         * 
          * @type Object
          * @example
          */
@@ -45 +38 @@
 
         /**
          * The nodes that are direct children of this element.
+         * 
          * @type Array
          * @example
          */
         this.children = [];
 
-        var dtd                 = CKEDITOR.dtd,
-                isBlockLike     = !!( dtd.$block[ name ] || dtd.$listItem[ name ] || dtd.$tableContent[ name ] ),
-                isEmpty         = !!dtd.$empty[ name ];
+        var dtd = CKEDITOR.dtd , isBlockLike = !! ( dtd.$block[ name ]
+                        || dtd.$listItem[ name ] || dtd.$tableContent[ name ] ) , isEmpty = !!dtd.$empty[ name ];
 
         /** @private */
-        this._ =
-        {
-                isBlockLike : isBlockLike,
-                isEmpty : isEmpty,
-                hasInlineStarted : isEmpty || !isBlockLike
+        this._ = {
+                isBlockLike :isBlockLike,
+                isEmpty :isEmpty,
+                hasInlineStarted :isEmpty || !isBlockLike
         };
 };
 
-(function()
+( function ( )
 {
         // Used to sort attribute entries in an array, where the first element of
         // each object is the attribute name.
-        var sortAttribs = function( a, b )
+        var sortAttribs = function ( a, b )
         {
-                a = a[0];
-                b = b[0];
+                a = a[ 0 ];
+                b = b[ 0 ];
                 return a < b ? -1 : a > b ? 1 : 0;
         };
 
-        CKEDITOR.htmlParser.element.prototype =
-        {
+        CKEDITOR.htmlParser.element.prototype = {
                 /**
                  * The node type. This is a constant value set to {@link CKEDITOR.NODE_ELEMENT}.
+                 * 
                  * @type Number
                  * @example
                  */
-                type : CKEDITOR.NODE_ELEMENT,
+                type :CKEDITOR.NODE_ELEMENT,
 
                 /**
                  * Adds a node to the element children list.
-                 * @param {Object} node The node to be added. It can be any of of the
-                 *              following types: {@link CKEDITOR.htmlParser.element},
-                 *              {@link CKEDITOR.htmlParser.text} and
-                 *              {@link CKEDITOR.htmlParser.comment}.
+                 * 
+                 * @param {Object}
+                 *            node The node to be added. It can be any of of the following types:
+                 *            {@link CKEDITOR.htmlParser.element}, {@link CKEDITOR.htmlParser.text} and
+                 *            {@link CKEDITOR.htmlParser.comment}.
                  * @function
                  * @example
                  */
-                add : CKEDITOR.htmlParser.fragment.prototype.add,
+                add :CKEDITOR.htmlParser.fragment.prototype.add,
 
                 /**
                  * Clone this element.
+                 * 
                  * @returns {CKEDITOR.htmlParser.element} The element clone.
                  * @example
                  */
-                clone : function()
+                clone : function ( )
                 {
-                        return new CKEDITOR.htmlParser.element( this.name, this.attributes );
+                        return new CKEDITOR.htmlParser.element( this.name , this.attributes );
                 },
 
                 /**
                  * Writes the element HTML to a CKEDITOR.htmlWriter.
-                 * @param {CKEDITOR.htmlWriter} writer The writer to which write the HTML.
+                 * 
+                 * @param {CKEDITOR.htmlWriter}
+                 *            writer The writer to which write the HTML.
                  * @example
-                 */
-                writeHtml : function( writer )
+//               */
+                writeHtml : function ( writer )
                 {
-                        // Open element tag.
-                        writer.openTag( this.name, this.attributes );
-
+                                // Open element tag.
+                        writer.openTag( this.name , this.attributes );
+        
                         // Copy all attributes to an array.
                         var attribsArray = [];
                         for ( var a in this.attributes )
+                        {
+                                if ( CKEDITOR.env.ie && a === '_cke_expando' ) // IE's treated expand fields as dom attributes, skip i
+                                        continue;
                                 attribsArray.push( [ a, this.attributes[ a ] ] );
-
+                        }
+        
                         // Sort the attributes by name.
                         attribsArray.sort( sortAttribs );
-
+        
                         // Send the attributes.
                         for ( var i = 0, len = attribsArray.length ; i < len ; i++ )
                         {
                                 var attrib = attribsArray[ i ];
-                                writer.attribute( attrib[0], attrib[1] );
+                                writer.attribute( attrib[ 0 ] , attrib[ 1 ] );
                         }
-
+        
                         // Close the tag.
-                        writer.openTagClose( this.name, this._.isEmpty );
-
+                        writer.openTagClose( this.name , this._.isEmpty );
+        
                         if ( !this._.isEmpty )
                         {
                                 // Send children.
-                                CKEDITOR.htmlParser.fragment.prototype.writeHtml.apply( this, arguments );
-
+                                CKEDITOR.htmlParser.fragment.prototype.writeHtml.apply( this ,
+                                                arguments );
+        
                                 // Close the element.
                                 writer.closeTag( this.name );
                         }
                 }
         };
-})();
+} )();