bootstrap onto closure

Gruntfile.js

@@ -108,33 +108,79 @@ module.exports = function (grunt) {
       },
       bootstrap: {
         src: [
-          'js/hover.js',
-          mq4HoverShim.featureDetector.umdGlobal,
-          'js/transition.js',
+          'js/util.js',
           'js/alert.js',
           'js/button.js',
           'js/carousel.js',
           'js/collapse.js',
           'js/dropdown.js',
           'js/modal.js',
+          'js/scrollspy.js',
           'js/tooltip.js',
           'js/popover.js',
-          'js/scrollspy.js',
-          'js/tab.js',
-          'js/affix.js'
+          'js/tab.js'
         ],
         dest: 'dist/js/<%= pkg.name %>.js'
       }
     },
 
+    closureCompiler:  {
+
+      options: {
+        compilerFile: require('superstartup-closure-compiler').getPath(),
+        checkModified: false,
+
+        compilerOpts: {
+           // jscomp_warning: 'reportUnknownTypes', someday - maybe we will get to 100% typed, this helps track those down
+           compilation_level: 'ADVANCED_OPTIMIZATIONS',
+           warning_level: 'verbose',
+           summary_detail_level: 3,
+           output_wrapper:
+                '"<%= banner %><%= jqueryCheck %><%= jqueryVersionCheck %>'
+             + '(function($){%output%})(jQuery);"',
+           externs: 'js/externs/*.js'
+        },
+
+        execOpts: {
+           maxBuffer: 999999 * 1024
+        },
+
+        // [OPTIONAL] Java VM optimization options
+        // see https://code.google.com/p/closure-compiler/wiki/FAQ#What_are_the_recommended_Java_VM_command-line_options?
+        // Setting one of these to 'true' is strongly recommended,
+        // and can reduce compile times by 50-80% depending on compilation size
+        // and hardware.
+        // On server-class hardware, such as with Github's Travis hook,
+        // TieredCompilation should be used; on standard developer hardware,
+        // d32 may be better. Set as appropriate for your environment.
+        // Default for both is 'false'; do not set both to 'true'.
+        d32: false, // will use 'java -client -d32 -jar compiler.jar'
+        TieredCompilation: false // will use 'java -server -XX:+TieredCompilation -jar compiler.jar'
+      },
+
+      targetName: {
+        src: [
+          'js/util.js',
+          'js/alert.js',
+          'js/button.js',
+          'js/carousel.js',
+          'js/collapse.js',
+          'js/dropdown.js',
+          'js/modal.js',
+          'js/scrollspy.js',
+          'js/tooltip.js',
+          'js/popover.js',
+          'js/tab.js'
+        ],
+        dest: 'dist/js/<%= pkg.name %>.min.js'
+      }
+
+    },
+
     uglify: {
       options: {
         preserveComments: 'some'
       },
-      core: {
-        src: '<%= concat.bootstrap.dest %>',
-        dest: 'dist/js/<%= pkg.name %>.min.js'
-      },
       docsJs: {
         src: configBridge.paths.docsJs,
         dest: 'docs/assets/js/docs.min.js'
@@ -388,7 +434,7 @@ module.exports = function (grunt) {
   grunt.registerTask('test-js', ['jshint:core', 'jshint:test', 'jshint:grunt', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);
 
   // JS distribution task.
-  grunt.registerTask('dist-js', ['concat', 'uglify:core', 'commonjs']);
+  grunt.registerTask('dist-js', ['concat', 'closureCompiler', 'commonjs']);
 
   grunt.registerTask('test-scss', ['scsslint:scss']);
 

dist/js/npm.js

 // This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
-require('../../js/transition.js')
+require('../../js/util.js')
+require('../../node_modules/mq4-hover-shim/dist/browser/mq4-hover-shim.js')
 require('../../js/alert.js')
 require('../../js/button.js')
 require('../../js/carousel.js')
 require('../../js/collapse.js')
 require('../../js/dropdown.js')
 require('../../js/modal.js')
+require('../../js/scrollspy.js')
 require('../../js/tooltip.js')
 require('../../js/popover.js')
-require('../../js/scrollspy.js')
 require('../../js/tab.js')
\ No newline at end of file
-require('../../js/affix.js')
\ No newline at end of file

js/alert.js

-/* ========================================================================
- * Bootstrap: alert.js v3.3.2
+/** =======================================================================
+ * Bootstrap: alert.js v4.0.0
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
+ * ========================================================================
+ * @fileoverview - Bootstrap's generic alert component. Add dismiss
+ * functionality to all alert messages with this plugin.
+ *
+ * Public Methods & Properties:
+ *
+ *   + $.alert
+ *   + $.alert.noConflict
+ *   + $.alert.Constructor
+ *   + $.alert.Constructor.VERSION
+ *   + $.alert.Constructor.prototype.close
+ *
+ * ========================================================================
+ */
 
-+function ($) {
-  'use strict';
+'use strict';
 
-  // ALERT CLASS DEFINITION
-  // ======================
 
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
+/**
+ * Our Alert class.
+ * @param {Element=} opt_element
+ * @constructor
+ */
+var Alert = function (opt_element) {
+  if (opt_element) {
+    $(opt_element).on('click', Alert._DISMISS_SELECTOR, Alert._handleDismiss(this))
   }
+}
+
+
+/**
+ * @const
+ * @type {string}
+ */
+Alert['VERSION'] = '4.0.0'
+
+
+/**
+ * @const
+ * @type {string}
+ * @private
+ */
+Alert._NAME = 'alert'
+
+
+/**
+ * @const
+ * @type {string}
+ * @private
+ */
+Alert._DATA_KEY = 'bs.alert'
+
+
+/**
+ * @const
+ * @type {string}
+ * @private
+ */
+Alert._DISMISS_SELECTOR = '[data-dismiss="alert"]'
+
+
+/**
+ * @const
+ * @type {number}
+ * @private
+ */
+Alert._TRANSITION_DURATION = 150
+
+
+/**
+ * @const
+ * @type {Function}
+ * @private
+ */
+Alert._JQUERY_NO_CONFLICT = $.fn[Alert._NAME]
+
+
+/**
+ * @const
+ * @enum {string}
+ * @private
+ */
+Alert._Event = {
+  CLOSE  : 'close.bs.alert',
+  CLOSED : 'closed.bs.alert'
+}
+
 
-  Alert.VERSION = '3.3.2'
+/**
+ * @const
+ * @enum {string}
+ * @private
+ */
+Alert._ClassName = {
+  ALERT : 'alert',
+  FADE  : 'fade',
+  IN    : 'in'
+}
 
-  Alert.TRANSITION_DURATION = 150
 
-  Alert.prototype.close = function (e) {
+/**
+ * Provides the jQuery Interface for the alert component.
+ * @param {string=} opt_config
+ * @this {jQuery}
+ * @return {jQuery}
+ * @private
+ */
+Alert._jQueryInterface = function (opt_config) {
+  return this.each(function () {
     var $this = $(this)
-    var selector = $this.attr('data-target')
+    var data  = $this.data(Alert._DATA_KEY)
 
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+    if (!data) {
+      data = new Alert(this)
+      $this.data(Alert._DATA_KEY, data)
     }
 
-    var $parent = $(selector)
+    if (opt_config === 'close') {
+      data[opt_config](this)
+    }
+  })
+}
 
-    if (e) e.preventDefault()
 
-    if (!$parent.length) {
-      $parent = $this.closest('.alert')
+/**
+ * Close the alert component
+ * @param {Alert} alertInstance
+ * @return {Function}
+ * @private
+ */
+Alert._handleDismiss = function (alertInstance) {
+  return function (event) {
+    if (event) {
+      event.preventDefault()
+    }
+
+    alertInstance['close'](this)
   }
+}
 
-    $parent.trigger(e = $.Event('close.bs.alert'))
 
-    if (e.isDefaultPrevented()) return
+/**
+ * Close the alert component
+ * @param {Element} element
+ */
+Alert.prototype['close'] = function (element) {
+  var rootElement = this._getRootElement(element)
+  var customEvent = this._triggerCloseEvent(rootElement)
 
-    $parent.removeClass('in')
+  if (customEvent.isDefaultPrevented()) return
 
-    function removeElement() {
-      // detach from parent, fire event then clean up data
-      $parent.detach().trigger('closed.bs.alert').remove()
+  this._removeElement(rootElement)
+}
+
+
+/**
+ * Tries to get the alert's root element
+ * @return {Element}
+ * @private
+ */
+Alert.prototype._getRootElement = function (element) {
+  var parent   = false
+  var selector = Bootstrap.getSelectorFromElement(element)
+
+  if (selector) {
+    parent = $(selector)[0]
   }
 
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one('bsTransitionEnd', removeElement)
-        .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
-      removeElement()
+  if (!parent) {
+    parent = $(element).closest('.' + Alert._ClassName.ALERT)[0]
   }
 
+  return parent
+}
 
-  // ALERT PLUGIN DEFINITION
-  // =======================
 
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
+/**
+ * Trigger close event on element
+ * @return {$.Event}
+ * @private
+ */
+Alert.prototype._triggerCloseEvent = function (element) {
+  var closeEvent = $.Event(Alert._Event.CLOSE)
+  $(element).trigger(closeEvent)
+  return closeEvent
+}
 
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
+
+/**
+ * Trigger closed event and remove element from dom
+ * @private
+ */
+Alert.prototype._removeElement = function (element) {
+  $(element).removeClass(Alert._ClassName.IN)
+
+  if (!Bootstrap.transition || !$(element).hasClass(Alert._ClassName.FADE)) {
+    this._destroyElement(element)
+    return
   }
 
-  var old = $.fn.alert
+  $(element)
+    .one(Bootstrap.TRANSITION_END, this._destroyElement.bind(this, element))
+    .emulateTransitionEnd(Alert._TRANSITION_DURATION)
+}
 
-  $.fn.alert             = Plugin
-  $.fn.alert.Constructor = Alert
 
+/**
+ * clean up any lingering jquery data and kill element
+ * @private
+ */
+Alert.prototype._destroyElement = function (element) {
+  $(element)
+    .detach()
+    .trigger(Alert._Event.CLOSED)
+    .remove()
+}
 
-  // ALERT NO CONFLICT
-  // =================
 
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
+/**
+ * ------------------------------------------------------------------------
+ * jQuery Interface + noConflict implementaiton
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * @const
+ * @type {Function}
+ */
+$.fn[Alert._NAME] = Alert._jQueryInterface
+
+
+/**
+ * @const
+ * @type {Function}
+ */
+$.fn[Alert._NAME]['Constructor'] = Alert
+
 
+/**
+ * @return {Function}
+ */
+$.fn[Alert._NAME]['noConflict'] = function () {
+  $.fn[Alert._NAME] = Alert._JQUERY_NO_CONFLICT
+  return Alert._jQueryInterface
+}
 
-  // ALERT DATA-API
-  // ==============
 
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
+/**
+ * ------------------------------------------------------------------------
+ * Data Api implementation
+ * ------------------------------------------------------------------------
+ */
 
-}(jQuery);
+$(document).on('click.bs.alert.data-api', Alert._DISMISS_SELECTOR, Alert._handleDismiss(new Alert))

js/button.js

-/* ========================================================================
- * Bootstrap: button.js v3.3.2
+/** =======================================================================
+ * Bootstrap: button.js v4.0.0
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
+ * ========================================================================
+ * @fileoverview - Bootstrap's generic button component.
+ *
+ * Note (@fat): Deprecated "setState" – imo, better solutions for managing a
+ * buttons state should exist outside this plugin.
+ *
+ * Public Methods & Properties:
+ *
+ *   + $.button
+ *   + $.button.noConflict
+ *   + $.button.Constructor
+ *   + $.button.Constructor.VERSION
+ *   + $.button.Constructor.prototype.toggle
+ *
+ * ========================================================================
+ */
+
+'use strict';
+
+
+/**
+ * Our Button class.
+ * @param {Element!} element
+ * @constructor
+ */
+var Button = function (element) {
+
+  /** @private {Element} */
+  this._element = element
+
+}
+
+
+/**
+ * @const
+ * @type {string}
+ */
+Button['VERSION']  = '4.0.0'
+
+
+/**
+ * @const
+ * @type {string}
+ * @private
+ */
+Button._NAME  = 'button'
+
+
+/**
+ * @const
+ * @type {string}
+ * @private
+ */
+Button._DATA_KEY = 'bs.button'
+
+
+/**
+ * @const
+ * @type {Function}
+ * @private
+ */
+Button._JQUERY_NO_CONFLICT = $.fn[Button._NAME]
+
+
+/**
+ * @const
+ * @enum {string}
+ * @private
+ */
+Button._ClassName = {
+  ACTIVE : 'active',
+  BUTTON : 'btn',
+  FOCUS  : 'focus'
+}
+
+
+/**
+ * @const
+ * @enum {string}
+ * @private
+ */
+Button._Selector = {
+  DATA_TOGGLE_CARROT : '[data-toggle^="button"]',
+  DATA_TOGGLE        : '[data-toggle="buttons"]',
+  INPUT              : 'input',
+  ACTIVE             : '.active',
+  BUTTON             : '.btn'
+}
+
+
+/**
+ * Provides the jQuery Interface for the Button component.
+ * @param {string=} opt_config
+ * @this {jQuery}
+ * @return {jQuery}
+ * @private
+ */
+Button._jQueryInterface = function (opt_config) {
+  return this.each(function () {
+    var data  = $(this).data(Button._DATA_KEY)
 
-  var Button = function (element, options) {
-    this.$element  = $(element)
-    this.options   = $.extend({}, Button.DEFAULTS, options)
-    this.isLoading = false
+    if (!data) {
+      data = new Button(this)
+      $(this).data(Button._DATA_KEY, data)
     }
 
-  Button.VERSION  = '3.3.2'
-
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
+    if (opt_config === 'toggle') {
+      data[opt_config]()
+    }
+  })
+}
+
+
+/**
+ * Toggle's the button active state
+ */
+Button.prototype['toggle'] = function () {
+  var triggerChangeEvent = true
+  var rootElement = $(this._element).closest(Button._Selector.DATA_TOGGLE)[0]
+
+  if (rootElement) {
+    var input = $(this._element).find(Button._Selector.INPUT)[0]
+    if (input) {
+      if (input.type == 'radio') {
+        if (input.checked && $(this._element).hasClass(Button._ClassName.ACTIVE)) {
+          triggerChangeEvent = false
+        } else {
+          var activeElement = $(rootElement).find(Button._Selector.ACTIVE)[0]
+          if (activeElement) {
+            $(activeElement).removeClass(Button._ClassName.ACTIVE)
           }
-
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
-
-    state = state + 'Text'
-
-    if (data.resetText == null) $el.data('resetText', $el[val]())
-
-    // push to event loop to allow forms to submit
-    setTimeout($.proxy(function () {
-      $el[val](data[state] == null ? this.options[state] : data[state])
-
-      if (state == 'loadingText') {
-        this.isLoading = true
-        $el.addClass(d).attr(d, d)
-      } else if (this.isLoading) {
-        this.isLoading = false
-        $el.removeClass(d).removeAttr(d)
         }
-    }, this), 0)
       }
 
-  Button.prototype.toggle = function () {
-    var changed = true
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
-
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-      if ($input.prop('type') == 'radio') {
-        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
-        else $parent.find('.active').removeClass('active')
+      if (triggerChangeEvent) {
+        input.checked = !$(this._element).hasClass(Button._ClassName.ACTIVE)
+        $(this._element).trigger('change')
+      }
     }
-      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
   } else {
-      this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
+    this._element.setAttribute('aria-pressed', !$(this._element).hasClass(Button._ClassName.ACTIVE))
   }
 
-    if (changed) this.$element.toggleClass('active')
+  if (triggerChangeEvent) {
+    $(this._element).toggleClass(Button._ClassName.ACTIVE)
   }
+}
 
 
-  // BUTTON PLUGIN DEFINITION
-  // ========================
+/**
+ * ------------------------------------------------------------------------
+ * jQuery Interface + noConflict implementaiton
+ * ------------------------------------------------------------------------
+ */
 
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
+/**
+ * @const
+ * @type {Function}
+ */
+$.fn[Button._NAME] = Button._jQueryInterface
 
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
 
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
+/**
+ * @const
+ * @type {Function}
+ */
+$.fn[Button._NAME]['Constructor'] = Button
 
-  var old = $.fn.button
 
-  $.fn.button             = Plugin
-  $.fn.button.Constructor = Button
+/**
+ * @const
+ * @type {Function}
+ */
+$.fn[Button._NAME]['noConflict'] = function () {
+  $.fn[Button._NAME] = Button._JQUERY_NO_CONFLICT
+  return this
+}
 
 
-  // BUTTON NO CONFLICT
-  // ==================
+/**
+ * ------------------------------------------------------------------------
+ * Data Api implementation
+ * ------------------------------------------------------------------------
+ */
 
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
+$(document)
+  .on('click.bs.button.data-api', Button._Selector.DATA_TOGGLE_CARROT, function (event) {
+    event.preventDefault()
 
+    var button = event.target
 
-  // BUTTON DATA-API
-  // ===============
+    if (!$(button).hasClass(Button._ClassName.BUTTON)) {
+      button = $(button).closest(Button._Selector.BUTTON)
+    }
 
-  $(document)
-    .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      var $btn = $(e.target)
-      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-      Plugin.call($btn, 'toggle')
-      e.preventDefault()
+    Button._jQueryInterface.call($(button), 'toggle')
   })
-    .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
+  .on('focus.bs.button.data-api blur.bs.button.data-api', Button._Selector.DATA_TOGGLE_CARROT, function (event) {
+    var button = $(event.target).closest(Button._Selector.BUTTON)[0]
+    $(button).toggleClass(Button._ClassName.FOCUS, /^focus(in)?$/.test(event.type))
   })
-
-}(jQuery);

js/externs/bootstrap.js

+jQuery.event.prototype.handleObj = function () {}
+jQuery.event.prototype.handleObj.handler = function () {}
+$.event.special = function () {}
+$.event.trueHover = true
+$.offset = {}
+$.offset.setOffset = function (a,b,c) {}

js/hover.js

-$(document).on('mq4hsChange', function (e) {
-  'use strict';
-  $(document.documentElement).toggleClass('bs-true-hover', e.trueHover);
-});

js/tests/closure.html

+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Bootstrap Plugin Test Suite</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- jQuery -->
+    <script src="vendor/jquery.min.js"></script>
+
+    <!-- QUnit -->
+    <link rel="stylesheet" href="vendor/qunit.css" media="screen">
+    <script src="vendor/qunit.js"></script>
+    <style>
+      #qunit-tests > li.pass {
+        display: none;/* Make it easier to see failing tests in Sauce screencasts */
+      }
+
+      #qunit-fixture {
+        top: 0;
+        left: 0;
+      }
+    </style>
+    <script>
+      // See https://github.com/axemclion/grunt-saucelabs#test-result-details-with-qunit
+      var log = []
+      QUnit.done(function (testResults) {
+        var tests = []
+        for (var i = 0, len = log.length; i < len; i++) {
+          var details = log[i]
+          tests.push({
+            name: details.name,
+            result: details.result,
+            expected: details.expected,
+            actual: details.actual,
+            source: details.source
+          })
+        }
+        testResults.tests = tests
+
+        window.global_test_results = testResults
+      })
+
+      QUnit.testStart(function (testDetails) {
+        $(window).scrollTop(0)
+        QUnit.log = function (details) {
+          if (!details.result) {
+            details.name = testDetails.name
+            log.push(details)
+          }
+        }
+      })
+
+      // Cleanup
+      QUnit.testDone(function () {
+        $('#qunit-fixture').empty()
+        $('#modal-test, .modal-backdrop').remove()
+      })
+    </script>
+
+    <!-- Plugin sources -->
+    <script src="../../dist/js/bootstrap.min.js"></script>
+
+    <!-- Unit tests -->
+    <script src="unit/alert.js"></script>
+    <script src="unit/button.js"></script>
+    <script src="unit/carousel.js"></script>
+    <script src="unit/collapse.js"></script>
+    <script src="unit/dropdown.js"></script>
+    <script src="unit/modal.js"></script>
+    <script src="unit/scrollspy.js"></script>
+    <script src="unit/tab.js"></script>
+    <script src="unit/tooltip.js"></script>
+    <script src="unit/popover.js"></script>
+
+  </head>
+  <body>
+    <div id="qunit-container">
+      <div id="qunit"></div>
+      <div id="qunit-fixture"></div>
+    </div>
+  </body>
+</html>

js/tests/index.html

@@ -59,7 +59,7 @@
     </script>
 
     <!-- Plugin sources -->
-    <script>$.support.transition = false</script>
+    <script src="../../js/util.js"></script>
     <script src="../../js/alert.js"></script>
     <script src="../../js/button.js"></script>
     <script src="../../js/carousel.js"></script>
@@ -70,7 +70,6 @@
     <script src="../../js/tab.js"></script>
     <script src="../../js/tooltip.js"></script>
     <script src="../../js/popover.js"></script>
-    <script src="../../js/affix.js"></script>
 
     <!-- Unit tests -->
     <script src="unit/alert.js"></script>
@@ -83,7 +82,6 @@
     <script src="unit/tab.js"></script>
     <script src="unit/tooltip.js"></script>
     <script src="unit/popover.js"></script>
-    <script src="unit/affix.js"></script>
 
   </head>
   <body>

js/tests/unit/button.js

@@ -29,61 +29,6 @@ $(function () {
     strictEqual($button[0], $el[0], 'collection contains element')
   })
 
-  test('should return set state to loading', function (assert) {
-    var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
-    equal($btn.html(), 'mdo', 'btn text equals mdo')
-    $btn.bootstrapButton('loading')
-    var done = assert.async()
-    setTimeout(function () {
-      equal($btn.html(), 'fat', 'btn text equals fat')
-      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
-      ok($btn.hasClass('disabled'), 'btn has disabled class')
-      done()
-    }, 0)
-  })
-
-  test('should return reset state', function (assert) {
-    var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
-    equal($btn.html(), 'mdo', 'btn text equals mdo')
-    $btn.bootstrapButton('loading')
-    var doneOne = assert.async()
-    setTimeout(function () {
-      equal($btn.html(), 'fat', 'btn text equals fat')
-      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
-      ok($btn.hasClass('disabled'), 'btn has disabled class')
-      doneOne()
-      var doneTwo = assert.async()
-      $btn.bootstrapButton('reset')
-      setTimeout(function () {
-        equal($btn.html(), 'mdo', 'btn text equals mdo')
-        ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
-        ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
-        doneTwo()
-      }, 0)
-    }, 0)
-  })
-
-  test('should work with an empty string as reset state', function (assert) {
-    var $btn = $('<button class="btn" data-loading-text="fat"/>')
-    equal($btn.html(), '', 'btn text equals ""')
-    $btn.bootstrapButton('loading')
-    var doneOne = assert.async()
-    setTimeout(function () {
-      equal($btn.html(), 'fat', 'btn text equals fat')
-      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
-      ok($btn.hasClass('disabled'), 'btn has disabled class')
-      doneOne()
-      var doneTwo = assert.async()
-      $btn.bootstrapButton('reset')
-      setTimeout(function () {
-        equal($btn.html(), '', 'btn text equals ""')
-        ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
-        ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
-        doneTwo()
-      }, 0)
-    }, 0)
-  })
-
   test('should toggle active', function () {
     var $btn = $('<button class="btn" data-toggle="button">mdo</button>')
     ok(!$btn.hasClass('active'), 'btn does not have active class')

js/tests/unit/carousel.js

@@ -322,30 +322,31 @@ $(function () {
         + '<a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a>'
         + '<a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a>'
         + '</div>'
+
     var $carousel = $(templateHTML)
     $carousel.attr('data-interval', 1814)
 
     $carousel.appendTo('body')
     $('[data-slide]').first().click()
-    equal($carousel.data('bs.carousel').options.interval, 1814)
+    equal($carousel.data('bs.carousel').getConfig().interval, 1814)
     $carousel.remove()
 
     $carousel.appendTo('body').attr('data-modal', 'foobar')
     $('[data-slide]').first().click()
-    equal($carousel.data('bs.carousel').options.interval, 1814, 'even if there is an data-modal attribute set')
+    equal($carousel.data('bs.carousel').getConfig().interval, 1814, 'even if there is an data-modal attribute set')
     $carousel.remove()
 
     $carousel.appendTo('body')
     $('[data-slide]').first().click()
     $carousel.attr('data-interval', 1860)
     $('[data-slide]').first().click()
-    equal($carousel.data('bs.carousel').options.interval, 1814, 'attributes should be read only on initialization')
+    equal($carousel.data('bs.carousel').getConfig().interval, 1814, 'attributes should be read only on initialization')
     $carousel.remove()
 
     $carousel.attr('data-interval', false)
     $carousel.appendTo('body')
     $carousel.bootstrapCarousel(1)
-    strictEqual($carousel.data('bs.carousel').options.interval, false, 'data attribute has higher priority than default options')
+    strictEqual($carousel.data('bs.carousel').getConfig().interval, false, 'data attribute has higher priority than default options')
     $carousel.remove()
   })
 

js/tests/unit/collapse.js

@@ -288,7 +288,7 @@ $(function () {
 
     $body2
       .toggleClass('in collapsing')
-      .data('bs.collapse').transitioning = 1
+      .data('bs.collapse').setTransitioning(true)
 
     $target1.click()
 

js/tests/unit/modal.js

@@ -30,7 +30,7 @@ $(function () {
   })
 
   test('should expose defaults var for settings', function () {
-    ok($.fn.bootstrapModal.Constructor.DEFAULTS, 'default object exposed')
+    ok($.fn.bootstrapModal.Constructor.Defaults, 'default object exposed')
   })
 
   test('should insert into dom when show method is called', function (assert) {

js/tests/visual/alert.html

@@ -34,7 +34,7 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../transition.js"></script>
+<script src="../../util.js"></script>
 <script src="../../alert.js"></script>
 
 </body>

js/tests/visual/button.html

@@ -15,10 +15,6 @@
     <h1>Button <small>Bootstrap Visual Test</small></h1>
   </div>
 
-  <button type="button" data-loading-text="Loading for 3 seconds..." class="btn btn-primary js-loading-button">
-    Loading state
-  </button>
-
   <button type="button" class="btn btn-primary" data-toggle="button">Single toggle</button>
 
   <div class="btn-group" data-toggle="buttons">
@@ -49,7 +45,7 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../transition.js"></script>
+<script src="../../util.js"></script>
 <script src="../../button.js"></script>
 
 <!-- JavaScript Test -->

js/tests/visual/carousel.html

@@ -44,7 +44,7 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../transition.js"></script>
+<script src="../../util.js"></script>
 <script src="../../carousel.js"></script>
 
 </body>

js/tests/visual/collapse.html

@@ -64,7 +64,7 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../transition.js"></script>
+<script src="../../util.js"></script>
 <script src="../../collapse.js"></script>
 
 </body>

js/tests/visual/dropdown.html

@@ -93,7 +93,7 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
-<script src="../../transition.js"></script>
+<script src="../../util.js"></script>
 <script src="../../dropdown.js"></script>
 <script src="../../collapse.js"></script>