Merge branch '3.4' into 3

This commit is contained in:
Daniel Hensby 2016-09-16 14:22:31 +01:00
commit cb2352548d
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -1081,7 +1081,7 @@ jQuery.noConflict();
this._super();
},
onremove: function() {
if(!this.data('button')) this.button('destroy');
if(this.data('button')) this.button('destroy');
this._super();
}
});