WordPress 4.4

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / media / plugin.js

diff --git a/wp-includes/js/tinymce/plugins/media/plugin.js b/wp-includes/js/tinymce/plugins/media/plugin.js
index 10d4b0b85422366ad7693cb415b54b3178e576f7..d0baf7334cf2c4d9d11d3efa2fcf17bc9897c29b 100644 (file)
--- a/wp-includes/js/tinymce/plugins/media/plugin.js
+++ b/wp-includes/js/tinymce/plugins/media/plugin.js
@@ -14,11 +14,11 @@
 
 tinymce.PluginManager.add('media', function(editor, url) {
        var urlPatterns = [
-               {regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$1'},
-               {regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$2'},
-               {regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: '//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc'},
-               {regex: /vimeo\.com\/(.*)\/([0-9]+)/, type: "iframe", w: 425, h: 350, url: "//player.vimeo.com/video/$2?title=0&byline=0"},
-               {regex: /maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/, type: 'iframe', w: 425, h: 350, url: '//maps.google.com/maps/ms?msid=$2&output=embed"'}
+               {regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$1', allowFullscreen: true},
+               {regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$2', allowFullscreen: true},
+               {regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: '//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc', allowfullscreen: true},
+               {regex: /vimeo\.com\/(.*)\/([0-9]+)/, type: "iframe", w: 425, h: 350, url: "//player.vimeo.com/video/$2?title=0&byline=0", allowfullscreen: true},
+               {regex: /maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/, type: 'iframe', w: 425, h: 350, url: '//maps.google.com/maps/ms?msid=$2&output=embed"', allowFullscreen: false}
        ];
 
        var embedChange = (tinymce.Env.ie && tinymce.Env.ie <= 8) ? 'onChange' : 'onInput';
@@ -265,6 +265,7 @@ tinymce.PluginManager.add('media', function(editor, url) {
 
                                data.source1 = url;
                                data.type = pattern.type;
+                               data.allowFullscreen = pattern.allowFullscreen;
                                data.width = data.width || pattern.w;
                                data.height = data.height || pattern.h;
                        }
@@ -288,7 +289,8 @@ tinymce.PluginManager.add('media', function(editor, url) {
                        });
 
                        if (data.type == "iframe") {
-                               html += '<iframe src="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '"></iframe>';
+                               var allowFullscreen = data.allowFullscreen ? ' allowFullscreen="1"' : '';
+                               html += '<iframe src="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '"' + allowFullscreen + '></iframe>';
                        } else if (data.source1mime == "application/x-shockwave-flash") {
                                html += '<object data="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '" type="application/x-shockwave-flash">';
 
@@ -394,7 +396,7 @@ tinymce.PluginManager.add('media', function(editor, url) {
                        return html;
                }
 
-               var writer = new tinymce.html.Writer();
+               var writer = new tinymce.html.Writer(), blocked;
 
                new tinymce.html.SaxParser({
                        validate: false,
@@ -414,6 +416,8 @@ tinymce.PluginManager.add('media', function(editor, url) {
                        },
 
                        start: function(name, attrs, empty) {
+                               blocked = true;
+
                                if (name == 'script' || name == 'noscript') {
                                        return;
                                }
@@ -422,13 +426,18 @@ tinymce.PluginManager.add('media', function(editor, url) {
                                        if (attrs[i].name.indexOf('on') === 0) {
                                                return;
                                        }
+
+                                       if (attrs[i].name == 'style') {
+                                               attrs[i].value = editor.dom.serializeStyle(editor.dom.parseStyle(attrs[i].value), name);
+                                       }
                                }
 
                                writer.start(name, attrs, empty);
+                               blocked = false;
                        },
 
                        end: function(name) {
-                               if (name == 'script' || name == 'noscript') {
+                               if (blocked) {
                                        return;
                                }
 
@@ -779,4 +788,8 @@ tinymce.PluginManager.add('media', function(editor, url) {
                context: 'insert',
                prependToContext: true
        });
+
+       editor.addCommand('mceMedia', showDialog);
+
+       this.showDialog = showDialog;
 });