Refactored destory method, make sure destoyed event is always called

jschr · Mar 4, 2014 · 1d82317 · 1d82317
1 parent 7adfa45
commit 1d82317
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
@@ -294,29 +294,26 @@
 
  destroy: function () {
  var e = $.Event('destroy');
+
  this.$element.trigger(e);
- if (e.isDefaultPrevented()) return;
 
- this.teardown();
- },
+ if (e.isDefaultPrevented()) return;
 
- teardown: function () {
- if (!this.$parent.length){
+ this.$element
+ .off('.modal')
+ .removeData('modal')
+ .removeClass('in')
+ .attr('aria-hidden', true);
+
+ if (this.$parent !== this.$element.parent()) {
+ this.$element.appendTo(this.$parent);
+ } else if (!this.$parent.length) {
+ // modal is not part of the DOM so remove it.
  this.$element.remove();
  this.$element = null;
- return;
- }
-
- if (this.$parent !== this.$element.parent()){
- this.$element.appendTo(this.$parent);
  }
 
- this.$element.off('.modal');
- this.$element.removeData('modal');
- this.$element
- .removeClass('in')
- .attr('aria-hidden', true)
- .trigger('destroyed');
+ this.$element.trigger('destroyed');
  }
  };