Ticket #2780: 2780.patch

_source/core/dtd.js

@@ -57 +57 @@
                 E = {hr:1,ul:1,menu:1,div:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1},
                 F = {ins:1,del:1,script:1},
                 G = X({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1},F),
-                H = X({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1},G),
+                H = X({sub:1,img:1,object:1,embed:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1},G),
                 I = X({p:1},H),
                 J = X({iframe:1},H,B),
-                K = {img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1},
+                K = {img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,object:1,embed:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1},
 
                 L = X({a:1},J),
                 M = {tr:1},
@@ -106 +106 @@
                  * @type Object
                  * @example
                  */
-                $tabIndex : {a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},
+                $tabIndex : {a:1,area:1,button:1,input:1,object:1,embed:1,select:1,textarea:1},
 
                 /**
                  * List of elements used inside the "table" element, like "tbody" or "td".
@@ -166 +166 @@
         'var' : L,
         div : P,
         object : O,
+                embed : O,
         sup : L,
         dd : P,
         strike : L,

_source/plugins/fakeobjects/plugin.js

@@ -84 +84 @@
          * @constructor
          * @example
          */
-        CKEDITOR.plugins.fakeobjects = function()
+        CKEDITOR.plugins.fakeobjects = function( editor )
         {
                 this._ =
                 {
+                        editor : editor,
                         objectTypes : [
                                 {
                                         match : function( nodeName, attributes )
@@ -144 +145 @@
                 {
                         var $ = element.$.cloneNode( true ),
                                 doc = $.ownerDocument,
-                                temp = doc.createElement( 'div' ),
-                                html;
+                                html, tmp = new CKEDITOR.dom.element( 'div', new CKEDITOR.dom.document( doc ) );
+                        element = new CKEDITOR.dom.element( $ );
+                        element.appendTo( tmp );
+                        html = this._.editor.dataProcessor.toDataFormat( tmp );
 
-                        // Get the object's HTML code.
-                        temp.appendChild( $ );
-                        html = temp.innerHTML;
-
                         // Get the fake element's CSS class.
                         var cssClass = 'unknown';
                         var realElementType = element.getName();
                         for ( var i = 0 ; i < this._.objectTypes.length ; i++ )
                         {
-                                if ( this._.objectTypes[i].match( element.getName(), element.$ ) )
+                                if ( this._.objectTypes[i].match( element.getName(), $ ) )
                                 {
                                         cssClass = 'cke_fakeobject' + ' ' + this._.objectTypes[i].cssClass;
                                         realElementType = this._.objectTypes[i].cssClass;
@@ -189 +188 @@
                 restoreElement : function( fakeImgElement )
                 {
                         var html = decodeURIComponent( fakeImgElement.getAttribute( '_cke_protected_html' ) ),
-                                realElement = CKEDITOR.dom.element.createFromHtml( html, editor.document );
+                                realElement = CKEDITOR.dom.element.createFromHtml( html, this._.editor.document );
 
                         if ( fakeImgElement.$.style.width )
                                 realElement.setStyle( 'width', fakeImgElement.$.style.width );
@@ -417 +416 @@
                 {
                         init : function( editor, pluginPath )
                         {
-                                editor.fakeobjects = new CKEDITOR.plugins.fakeobjects();
+                                editor.fakeobjects = new CKEDITOR.plugins.fakeobjects( editor );
                         }
                 } );
 })();