Changeset 35708

Timestamp:

11/19/2015 11:05:39 PM (9 years ago)

Author:

pento

Message:

Embeds: Remove & characters from the inline embed JS.

Older versions of WordPress will convert those & characters to &, which makes for some non-functional JS. If folks are running an older release, let's not make their lives more difficult than it already is.

Props pento, peterwilsoncc.

See #34698.

Location:

trunk

Files:

• Gruntfile.js (modified) (2 diffs)
• src/wp-includes/js/wp-embed.js (modified) (3 diffs)

trunk/Gruntfile.js

@@ -436 +436 @@
                     '!wp-includes/js/swfobject.js',
                     '!wp-includes/js/underscore.*',
-                    '!wp-includes/js/zxcvbn.min.js'
-                ]
+                    '!wp-includes/js/zxcvbn.min.js',
+                    '!wp-includes/js/wp-embed.js' // We have extra options for this, see uglify:embed
+                ]
+            },
+            embed: {
+                options: {
+                    compress: {
+                        conditionals: false
+                    }
+                },
+                expand: true,
+                cwd: SOURCE_DIR,
+                dest: BUILD_DIR,
+                ext: '.min.js',
+                src: ['wp-includes/js/wp-embed.js']
             },
             media: {
@@ -648 +661 @@
         'cssmin:colors',
         'uglify:core',
+        'uglify:embed',
         'uglify:jqueryui',
         'concat:tinymce',

trunk/src/wp-includes/js/wp-embed.js

@@ -2 +2 @@
     'use strict';
 
-    var supportedBrowser = ( document.querySelector && window.addEventListener ),
+    var supportedBrowser = false,
         loaded = false;
+
+        if ( document.querySelector ) {
+            if ( window.addEventListener ) {
+                supportedBrowser = true;
+            }
+        }
 
     window.wp = window.wp || {};
@@ -51 +57 @@
 
                 /* Only continue if link hostname matches iframe's hostname. */
-                if ( targetURL.host === sourceURL.host && document.activeElement === source ) {
-                    window.top.location.href = data.value;
+                if ( targetURL.host === sourceURL.host ) {
+                    if ( document.activeElement === source ) {
+                        window.top.location.href = data.value;
+                    }
                 }
             }
@@ -78 +86 @@
             source.style.display = '';
 
-            if ( !source.getAttribute( 'data-secret' ) ) {
-                /* Add secret to iframe */
-                secret = Math.random().toString( 36 ).substr( 2, 10 );
-                source.src += '#?secret=' + secret;
-                source.setAttribute( 'data-secret', secret );
+            if ( source.getAttribute( 'data-secret' ) ) {
+                continue;
             }
 
+            /* Add secret to iframe */
+            secret = Math.random().toString( 36 ).substr( 2, 10 );
+            source.src += '#?secret=' + secret;
+            source.setAttribute( 'data-secret', secret );
+
             /* Remove security attribute from iframes in IE10 and IE11. */
-            if ( ( isIE10 || isIE11 ) && !!source.getAttribute( 'security' ) ) {
+            if ( ( isIE10 || isIE11 ) ) {
                 iframeClone = source.cloneNode( true );
                 iframeClone.removeAttribute( 'security' );