implement global dispose method

1 files changed, 20 insertions, 7 deletions

diff --git a/js/dist/collapse.js b/js/dist/collapse.js
index 7a5e5df9b6..0d014da2e3 100644
--- a/js/dist/collapse.js
+++ b/js/dist/collapse.js
@@ -22,6 +22,8 @@ var Collapse = (function ($) {
   var NAME = 'collapse';
   var VERSION = '4.0.0';
   var DATA_KEY = 'bs.collapse';
+  var EVENT_KEY = '.' + DATA_KEY;
+  var DATA_API_KEY = '.data-api';
   var JQUERY_NO_CONFLICT = $.fn[NAME];
   var TRANSITION_DURATION = 600;
 
@@ -31,11 +33,11 @@ var Collapse = (function ($) {
   };
 
   var Event = {
-    SHOW: 'show.bs.collapse',
-    SHOWN: 'shown.bs.collapse',
-    HIDE: 'hide.bs.collapse',
-    HIDDEN: 'hidden.bs.collapse',
-    CLICK: 'click.bs.collapse.data-api'
+    SHOW: 'show' + EVENT_KEY,
+    SHOWN: 'shown' + EVENT_KEY,
+    HIDE: 'hide' + EVENT_KEY,
+    HIDDEN: 'hidden' + EVENT_KEY,
+    CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY
   };
 
   var ClassName = {
@@ -102,8 +104,8 @@ var Collapse = (function ($) {
           return;
         }
 
-        var activesData = undefined;
         var actives = undefined;
+        var activesData = undefined;
 
         if (this._parent) {
           actives = $.makeArray($(Selector.ACTIVES));
@@ -217,6 +219,17 @@ var Collapse = (function ($) {
         this._isTransitioning = isTransitioning;
       }
     }, {
+      key: 'dispose',
+      value: function dispose() {
+        $.removeData(this._element, DATA_KEY);
+
+        this._config = null;
+        this._parent = null;
+        this._element = null;
+        this._triggerArray = null;
+        this._isTransitioning = null;
+      }
+    }, {
       key: '_getDimension',
 
       // private
@@ -306,7 +319,7 @@ var Collapse = (function ($) {
    * ------------------------------------------------------------------------
    */
 
-  $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) {
+  $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
     event.preventDefault();
 
     var target = Collapse._getTargetFromElement(this);