Changeset 7545

Timestamp:

07/06/12 09:14:51 (11 months ago)

Author:

garry.yao

Message:

#9094: Fixed a regression of [7542] which breaks flash objects parsing.

File:

• CKEditor/trunk/_source/core/htmlparser/element.js (modified) (3 diffs)

CKEditor/trunk/_source/core/htmlparser/element.js

@@ -26 +26 @@
          * @example
          */
-        this.attributes = attributes || ( attributes = {} );
+        this.attributes = attributes || {};
 
         /**
@@ -35 +35 @@
         this.children = [];
 
-        var tagName = attributes[ 'data-cke-real-element-type' ] || name || '';
-
-        // Reveal the real semantic of our internal custom tag name (#6639).
-        var internalTag = tagName.match( /^cke:(.*)/ );
-        internalTag && ( tagName = internalTag[ 1 ] );
-
-        var dtd                 = CKEDITOR.dtd,
-                isBlockLike     = !!( dtd.$nonBodyContent[ tagName ]
-                                || dtd.$block[ tagName ]
-                                || dtd.$listItem[ tagName ]
-                                || dtd.$tableContent[ tagName ]
-                                || dtd.$nonEditable[ tagName ]
-                                || tagName == 'br' ),
-                isEmpty = !!dtd.$empty[ tagName ];
-
-        this.isEmpty    = isEmpty;
-        this.isUnknown  = !dtd[ tagName ];
+        // Reveal the real semantic of our internal custom tag name (#6639),
+        // when resolving whether it's block like.
+        var realName = name || '',
+                prefixed = realName.match( /^cke:(.*)/ );
+        prefixed && ( realName = prefixed[ 1 ] );
+
+        var isBlockLike = !!( CKEDITOR.dtd.$nonBodyContent[ realName ]
+                                || CKEDITOR.dtd.$block[ realName ]
+                                || CKEDITOR.dtd.$listItem[ realName ]
+                                || CKEDITOR.dtd.$tableContent[ realName ]
+                                || CKEDITOR.dtd.$nonEditable[ realName ]
+                                || realName == 'br' );
+
+        this.isEmpty    = !!CKEDITOR.dtd.$empty[ name ];
+        this.isUnknown  = !CKEDITOR.dtd[ name ];
 
         /** @private */
@@ -57 +55 @@
         {
                 isBlockLike : isBlockLike,
-                hasInlineStarted : isEmpty || !isBlockLike
+                hasInlineStarted : this.isEmpty || !isBlockLike
         };
 };