Changeset 20517

Timestamp:

04/18/2012 08:25:31 PM (14 years ago)

Author:

koopersmith

Message:

Theme Customizer: Use native postMessage for wp.customize.Messenger. see #19910.

• Removes use of jquery.postmessage.js
• Fixes bug where Opera would attempt to use the hash transport and redirect to the dashboard.
• Fixes bug where multiple postMessage connections could not coexist in a single frame.

Location:

trunk/wp-includes/js

Files:

• customize-base.dev.js (modified) (4 diffs)
• customize-loader.dev.js (modified) (3 diffs)

trunk/wp-includes/js/customize-base.dev.js

@@ -432 +432 @@
 
                         url = this.add( 'url', url );
-                        this.add( 'targetWindow', targetWindow || null );
+                        this.add( 'targetWindow', targetWindow || window.parent );
                         this.add( 'origin', url() ).link( url ).setter( function( to ) {
                                 return to.replace( /([^:]+:\/\/[^\/]+).*/, '$1' );
@@ -439 +439 @@
                         this.topics = {};
 
-                        $.receiveMessage( $.proxy( this.receive, this ), this.origin() || null );
+                        this.receive = $.proxy( this.receive, this );
+                        $( window ).on( 'message', this.receive );
+                },
+
+                destroy: function() {
+                        $( window ).off( 'message', this.receive );
                 },
 
@@ -445 +450 @@
                         var message;
 
-                        // @todo: remove, this is done in the postMessage plugin.
-                        // if ( this.origin && event.origin !== this.origin )
-                        //      return;
+                        event = event.originalEvent;
+
+                        // Check to make sure the origin is valid.
+                        if ( this.origin() && event.origin !== this.origin() )
+                                return;
 
                         message = JSON.parse( event.data );
@@ -464 +471 @@
 
                         message = JSON.stringify({ id: id, data: data });
-                        $.postMessage( message, this.url(), this.targetWindow() );
+                        this.targetWindow().postMessage( message, this.origin() );
                 },
 

trunk/wp-includes/js/customize-loader.dev.js

@@ -44 +44 @@
                                 Loader.open( wpCustomizeLoaderL10n.url + '?' + hash );
 
-                        if ( ! hash )
+                        if ( ! hash && ! Loader.supports.history )
                                 Loader.close();
                 },
@@ -79 +79 @@
                                 if ( Loader.supports.history && window.location.href !== src )
                                         history.pushState( { customize: src }, '', src );
-                                else if ( Loader.supports.hashchange && hash )
+                                else if ( ! Loader.supports.history && Loader.supports.hashchange && hash )
                                         window.location.hash = hash;
                         });
@@ -90 +90 @@
                         this.element.fadeOut( 200, function() {
                                 Loader.iframe.remove();
+                                Loader.messenger.destroy();
                                 Loader.iframe    = null;
                                 Loader.messenger = null;