← Back to branch summary

~canonical-sysadmins/wordpress/4.5.3

« back to all changes in this revision

Viewing changes to wp-includes/js/customize-views.js

  • Committer: Nick Moffitt
  • Date: 2016-04-14 10:44:19 UTC
  • mfrom: (1.1.14 upstream)
  • Revision ID: nick.moffitt@canonical.com-20160414104419-w6lxcr3ru4enc2w5
Merge WP4.5 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/js/customize-views.js
63
63
                setPlaceholder: function(_height) {
64
64
                        var height = _height || this.getHeight();
65
65
                        this.model.set('savedHeight', height);
66
 
                        this.$el
67
 
                                .add(this.$el.find('.placeholder'))
68
 
                                .height(height);
 
66
                        this.$el.height(height);
69
67
                },
70
68
 
71
69
                setButtons: function() {