Ticket #31742: 31742.1.diff

wp-includes/js/customize-views.js

@@ -105 +105 @@
                 },
 
                 initialize: function() {
-                        var properties = [
-                                this.model.get('header').url,
-                                this.model.get('choice')
-                        ];
-
                         this.listenTo(this.model, 'change:selected', this.toggleSelected);
 
-                        if (_.contains(properties, api.get().header_image)) {
+                        if ( this.isCurrentHeader() ) {
                                 api.HeaderTool.currentHeader.set(this.extendedModel());
                         }
                 },
 
+                isCurrentHeader: function() {
+                        var currentHeaderId = api.get().header_image_data.attachment_id;
+                        if ( currentHeaderId && this.model.get( 'header' ).attachment_id === currentHeaderId ) {
+                                return true;
+                        }
+                        if ( ! currentHeaderId && this.model.get( 'choice' ) === api.get().header_image ) {
+                                return true;
+                        }
+                        return false;
+                },
+
                 render: function() {
                         this.$el.html(this.template(this.extendedModel()));
 

wp-includes/js/customize-views.min.js

@@ -1 @@
-!function(a,b,c){if(b&&b.customize){var d=b.customize;d.HeaderTool.CurrentView=b.Backbone.View.extend({template:b.template("header-current"),initialize:function(){this.listenTo(this.model,"change",this.render),this.render()},render:function(){return this.$el.html(this.template(this.model.toJSON())),this.setPlaceholder(),this.setButtons(),this},getHeight:function(){var a,b,c,e=this.$el.find("img");return e.length?(this.$el.find(".inner").hide(),a=this.model.get("savedHeight"),b=e.height()||a,b||(c=d.get().header_image_data,b=c&&c.width&&c.height?260/c.width*c.height:40),b):(this.$el.find(".inner").show(),40)},setPlaceholder:function(a){var b=a||this.getHeight();this.model.set("savedHeight",b),this.$el.add(this.$el.find(".placeholder")).height(b)},setButtons:function(){var b=a("#customize-control-header_image .actions .remove");this.model.get("choice")?b.show():b.hide()}}),d.HeaderTool.ChoiceView=b.Backbone.View.extend({template:b.template("header-choice"),className:"header-view",events:{"click .choice,.random":"select","click .close":"removeImage"},initialize:function(){var a=[this.model.get("header").url,this.model.get("choice")];this.listenTo(this.model,"change:selected",this.toggleSelected),c.contains(a,d.get().header_image)&&d.HeaderTool.currentHeader.set(this.extendedModel())},render:function(){return this.$el.html(this.template(this.extendedModel())),this.toggleSelected(),this},toggleSelected:function(){this.$el.toggleClass("selected",this.model.get("selected"))},extendedModel:function(){var a=this.model.get("collection");return c.extend(this.model.toJSON(),{type:a.type})},getHeight:d.HeaderTool.CurrentView.prototype.getHeight,setPlaceholder:d.HeaderTool.CurrentView.prototype.setPlaceholder,select:function(){this.preventJump(),this.model.save(),d.HeaderTool.currentHeader.set(this.extendedModel())},preventJump:function(){var b=a(".wp-full-overlay-sidebar-content"),d=b.scrollTop();c.defer(function(){b.scrollTop(d)})},removeImage:function(a){a.stopPropagation(),this.model.destroy(),this.remove()}}),d.HeaderTool.ChoiceListView=b.Backbone.View.extend({initialize:function(){this.listenTo(this.collection,"add",this.addOne),this.listenTo(this.collection,"remove",this.render),this.listenTo(this.collection,"sort",this.render),this.listenTo(this.collection,"change",this.toggleList),this.render()},render:function(){this.$el.empty(),this.collection.each(this.addOne,this),this.toggleList()},addOne:function(a){var b;a.set({collection:this.collection}),b=new d.HeaderTool.ChoiceView({model:a}),this.$el.append(b.render().el)},toggleList:function(){var a=this.$el.parents().prev(".customize-control-title"),b=this.$el.find(".random").parent();this.collection.shouldHideTitle()?a.add(b).hide():a.add(b).show()}}),d.HeaderTool.CombinedList=b.Backbone.View.extend({initialize:function(a){this.collections=a,this.on("all",this.propagate,this)},propagate:function(a,b){c.each(this.collections,function(c){c.trigger(a,b)})}})}}(jQuery,window.wp,_);
- No newline at end of file
+!function(e,t,i){if(t&&t.customize){var o=t.customize;o.HeaderTool.CurrentView=t.Backbone.View.extend({template:t.template("header-current"),initialize:function(){this.listenTo(this.model,"change",this.render),this.render()},render:function(){return this.$el.html(this.template(this.model.toJSON())),this.setPlaceholder(),this.setButtons(),this},getHeight:function(){var e,t,i,n=this.$el.find("img");return n.length?(this.$el.find(".inner").hide(),e=this.model.get("savedHeight"),t=n.height()||e,t||(i=o.get().header_image_data,t=i&&i.width&&i.height?260/i.width*i.height:40),t):(this.$el.find(".inner").show(),40)},setPlaceholder:function(e){var t=e||this.getHeight();this.model.set("savedHeight",t),this.$el.add(this.$el.find(".placeholder")).height(t)},setButtons:function(){var t=e("#customize-control-header_image .actions .remove");this.model.get("choice")?t.show():t.hide()}}),o.HeaderTool.ChoiceView=t.Backbone.View.extend({template:t.template("header-choice"),className:"header-view",events:{"click .choice,.random":"select","click .close":"removeImage"},initialize:function(){this.listenTo(this.model,"change:selected",this.toggleSelected),this.isCurrentHeader()&&o.HeaderTool.currentHeader.set(this.extendedModel())},isCurrentHeader:function(){var e=o.get().header_image_data.attachment_id;return e&&this.model.get("header").attachment_id===e?!0:e||this.model.get("choice")!==o.get().header_image?!1:!0},render:function(){return this.$el.html(this.template(this.extendedModel())),this.toggleSelected(),this},toggleSelected:function(){this.$el.toggleClass("selected",this.model.get("selected"))},extendedModel:function(){var e=this.model.get("collection");return i.extend(this.model.toJSON(),{type:e.type})},getHeight:o.HeaderTool.CurrentView.prototype.getHeight,setPlaceholder:o.HeaderTool.CurrentView.prototype.setPlaceholder,select:function(){this.preventJump(),this.model.save(),o.HeaderTool.currentHeader.set(this.extendedModel())},preventJump:function(){var t=e(".wp-full-overlay-sidebar-content"),o=t.scrollTop();i.defer(function(){t.scrollTop(o)})},removeImage:function(e){e.stopPropagation(),this.model.destroy(),this.remove()}}),o.HeaderTool.ChoiceListView=t.Backbone.View.extend({initialize:function(){this.listenTo(this.collection,"add",this.addOne),this.listenTo(this.collection,"remove",this.render),this.listenTo(this.collection,"sort",this.render),this.listenTo(this.collection,"change",this.toggleList),this.render()},render:function(){this.$el.empty(),this.collection.each(this.addOne,this),this.toggleList()},addOne:function(e){var t;e.set({collection:this.collection}),t=new o.HeaderTool.ChoiceView({model:e}),this.$el.append(t.render().el)},toggleList:function(){var e=this.$el.parents().prev(".customize-control-title"),t=this.$el.find(".random").parent();this.collection.shouldHideTitle()?e.add(t).hide():e.add(t).show()}}),o.HeaderTool.CombinedList=t.Backbone.View.extend({initialize:function(e){this.collections=e,this.on("all",this.propagate,this)},propagate:function(e,t){i.each(this.collections,function(i){i.trigger(e,t)})}})}}(jQuery,window.wp,_);
+ No newline at end of file