call disable before destroy to clear emptytext, fixes

This commit is contained in:
vitalets 2013-04-23 10:35:35 +04:00
parent 25bf2a360f
commit e97783378a
2 changed files with 9 additions and 4 deletions
src/element
test/unit

@ -416,6 +416,8 @@ Makes editable any HTML element on the page. Applied as jQuery method.
@method destroy() @method destroy()
**/ **/
destroy: function() { destroy: function() {
this.disable();
if(this.container) { if(this.container) {
this.container.destroy(); this.container.destroy();
} }
@ -427,8 +429,7 @@ Makes editable any HTML element on the page. Applied as jQuery method.
this.$element.off("save.internal"); this.$element.off("save.internal");
this.$element.removeClass('editable'); this.$element.removeClass('editable editable-open editable-disabled');
this.$element.removeClass('editable-open');
this.$element.removeData('editable'); this.$element.removeData('editable');
} }
}; };

@ -383,6 +383,7 @@ $(function () {
e.click(); e.click();
var p = tip(e); var p = tip(e);
ok(p.is(':visible'), 'container visible'); ok(p.is(':visible'), 'container visible');
equal(e.text(), 'Empty', 'emptytext shown');
e.editable('destroy'); e.editable('destroy');
@ -392,9 +393,12 @@ $(function () {
ok(!e.hasClass('editable'), 'editable class removed'); ok(!e.hasClass('editable'), 'editable class removed');
ok(!e.hasClass('editable-click'), 'editable-click class removed'); ok(!e.hasClass('editable-click'), 'editable-click class removed');
equal(e.text(), '', 'emptytext removed');
e.click(); e.click();
}); });
}); });