Ticket #32920: 32920.patch

wp-includes/js/tinymce/plugins/media/plugin.js

@@ -620 +620 @@
 
                 // Converts iframe, video etc into placeholder images
                 editor.parser.addNodeFilter('iframe,video,audio,object,embed,script', function(nodes, name) {
-                        var i = nodes.length, ai, node, placeHolder, attrName, attrValue, attribs, innerHtml;
-                        var videoScript;
+            var i = nodes.length, ai, node, placeHolder, attrName, attrValue, attribs, innerHtml;
+            var videoScript, alignClass;
 
                         while (i--) {
                                 node = nodes[i];
@@ -674 +674 @@
                                         placeHolder.firstChild = null;
                                 }
 
-                                placeHolder.attr({
+                var className = "mce-object mce-object-" + name;
+                var nodeClasses = node.attr('class');
+
+                if( undefined !== nodeClasses){
+                    nodeClasses = nodeClasses.split(' ');
+                    alignClass = editor.findAlignClass(nodeClasses);
+
+                    if( alignClass != ''){
+                        className += ' ' + alignClass;
+                    }
+
+                }
+
+                placeHolder.attr({
                                         width: node.attr('width') || "300",
                                         height: node.attr('height') || (name == "audio" ? "30" : "150"),
                                         style: node.attr('style'),
                                         src: tinymce.Env.transparentSrc,
                                         "data-mce-object": name,
-                                        "class": "mce-object mce-object-" + name
+                                        "class": className
                                 });
 
                                 node.replace(placeHolder);
@@ -689 +702 @@
 
                 // Replaces placeholder images with real elements for video, object, iframe etc
                 editor.serializer.addAttributeFilter('data-mce-object', function(nodes, name) {
-                        var i = nodes.length, node, realElm, ai, attribs, innerHtml, innerNode, realElmName;
+            var i = nodes.length, node, realElm, ai, attribs, innerHtml, innerNode, realElmName,
+                realElmClass, alignClass;
 
                         while (i--) {
                                 node = nodes[i];
@@ -736 +750 @@
                                         realElm.append(innerNode);
                                 }
 
+                if(realElmName == 'iframe' && undefined !== node.attr('class') ){
+                    var classes = node.attr('class').trim().split(' ');
+                    alignClass = editor.findAlignClass(classes);
+
+                    if(alignClass != ''){
+                        realElmClass = realElm.attr('class');
+
+                        if(alignClass == 'alignnone'){
+                            // remove align class if alignnone is detected
+                            realElm.attr( 'class' , null );
+                        }else{
+                            realElm.attr( 'class', alignClass.trim() );
+                        }
+                    }
+
+                }
+
                                 node.replace(realElm);
                         }
                 });
@@ -779 +810 @@
                 context: 'insert',
                 prependToContext: true
         });
+
+    editor.findAlignClass = function(classes){
+        var j, k, alignClasses = ['alignnone', 'aligncenter', 'alignleft', 'alignright'];
+
+        for( j = classes.length; j > 0; j-- ){
+            // loop backward because editor add align classes in the end of the class string
+            // ensures only one iteration
+
+            for ( k = 0; k < alignClasses.length; k++){
+
+                if(classes[j - 1] == alignClasses[k]){
+                    return alignClasses[k];
+                }
+
+            }
+
+        }
+
+        return '';
+    };
+
 });