Merge branch 'v4' of github.com:twbs/derpstrap into v4

1 files changed, 24 insertions, 25 deletions

diff --git a/js/dist/collapse.js b/js/dist/collapse.js
index 9db1b8e60..859913f61 100644
--- a/js/dist/collapse.js
+++ b/js/dist/collapse.js
@@ -42,7 +42,7 @@ var Collapse = (function ($) {
     SHOWN: 'shown' + EVENT_KEY,
     HIDE: 'hide' + EVENT_KEY,
     HIDDEN: 'hidden' + EVENT_KEY,
-    CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY
+    CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
   };
 
   var ClassName = {
@@ -88,6 +88,14 @@ var Collapse = (function ($) {
       }
     }
 
+    /**
+     * ------------------------------------------------------------------------
+     * Data Api implementation
+     * ------------------------------------------------------------------------
+     */
+
+    // getters
+
     _createClass(Collapse, [{
       key: 'toggle',
 
@@ -234,11 +242,11 @@ var Collapse = (function ($) {
         this._triggerArray = null;
         this._isTransitioning = null;
       }
-    }, {
-      key: '_getConfig',
 
       // private
 
+    }, {
+      key: '_getConfig',
       value: function _getConfig(config) {
         config = $.extend({}, Default, config);
         config.toggle = !!config.toggle; // coerce string values
@@ -277,24 +285,11 @@ var Collapse = (function ($) {
           }
         }
       }
-    }], [{
-      key: 'VERSION',
-
-      // getters
-
-      get: function () {
-        return VERSION;
-      }
-    }, {
-      key: 'Default',
-      get: function () {
-        return Default;
-      }
-    }, {
-      key: '_getTargetFromElement',
 
       // static
 
+    }], [{
+      key: '_getTargetFromElement',
       value: function _getTargetFromElement(element) {
         var selector = Util.getSelectorFromElement(element);
         return selector ? $(selector)[0] : null;
@@ -321,17 +316,21 @@ var Collapse = (function ($) {
           }
         });
       }
+    }, {
+      key: 'VERSION',
+      get: function get() {
+        return VERSION;
+      }
+    }, {
+      key: 'Default',
+      get: function get() {
+        return Default;
+      }
     }]);
 
     return Collapse;
   })();
 
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
   $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
     event.preventDefault();
 
@@ -358,4 +357,4 @@ var Collapse = (function ($) {
 
   return Collapse;
 })(jQuery);
-//# sourceMappingURL=collapse.js.map
\ No newline at end of file
+//# sourceMappingURL=collapse.js.map