WordPress 3.8

[autoinstalls/wordpress.git] / wp-includes / js / customize-base.js

diff --git a/wp-includes/js/customize-base.js b/wp-includes/js/customize-base.js
index 81d37716e64c6ba921ed1a5ad71e89841749f625..db573b5fcaad836e430fb0e12771ccdde15f30cb 100644 (file)
--- a/wp-includes/js/customize-base.js
+++ b/wp-includes/js/customize-base.js
@@ -129,14 +129,14 @@ window.wp = window.wp || {};
                        return this;
                },
 
-               bind: function( id, callback ) {
+               bind: function( id ) {
                        this.topics = this.topics || {};
                        this.topics[ id ] = this.topics[ id ] || $.Callbacks();
                        this.topics[ id ].add.apply( this.topics[ id ], slice.call( arguments, 1 ) );
                        return this;
                },
 
-               unbind: function( id, callback ) {
+               unbind: function( id ) {
                        if ( this.topics && this.topics[ id ] )
                                this.topics[ id ].remove.apply( this.topics[ id ], slice.call( arguments, 1 ) );
                        return this;
@@ -209,12 +209,12 @@ window.wp = window.wp || {};
                        return value;
                },
 
-               bind: function( callback ) {
+               bind: function() {
                        this.callbacks.add.apply( this.callbacks, arguments );
                        return this;
                },
 
-               unbind: function( callback ) {
+               unbind: function() {
                        this.callbacks.remove.apply( this.callbacks, arguments );
                        return this;
                },
@@ -533,6 +533,11 @@ window.wp = window.wp || {};
                        if ( this.origin() && event.origin !== this.origin() )
                                return;
 
+                       // Ensure we have a string that's JSON.parse-able
+                       if ( typeof event.data !== 'string' || event.data[0] !== '{' ) {
+                               return;
+                       }
+
                        message = JSON.parse( event.data );
 
                        // Check required message properties.