Merge pull request #13904 from twbs/revert-umd

Revert UMD for now, due to #13812.
twbs · Jun 24, 2014 · b31c35b · b31c35b
2 parents 25b06d9 + c2c19a4
commit b31c35b
Show file tree

Hide file tree

Showing 17 changed files with 1,491 additions and 1,563 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -33,7 +33,7 @@ module.exports = function (grunt) {
             ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
             ' */\n',
     // NOTE: This jqueryCheck code is duplicated in customizer.js; if making changes here, be sure to update the other copy too.
-    jqueryCheck: 'if (typeof define == \'undefined\' && typeof exports == \'undefined\' && typeof jQuery == \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',
+    jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',
 
     // Task configuration.
     clean: {

diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
@@ -4,7 +4,7 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQuery == 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
+if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
 
 /* ========================================================================
  * Bootstrap: transition.js v3.1.1

diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/_src/customizer.js
@@ -306,7 +306,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
 
   function generateJS(preamble) {
     var $checked = $('#plugin-section input:checked')
-    var jqueryCheck = 'if (typeof define == \'undefined\' && typeof exports == \'undefined\' && typeof jQuery == \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n'
+    var jqueryCheck = 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap\'s JavaScript requires jQuery") }\n\n'
 
     if (!$checked.length) return false
 

diff --git a/js/.jscsrc b/js/.jscsrc
@@ -11,9 +11,10 @@
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
   "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
   "disallowSpacesInsideArrayBrackets": true,
-  "disallowTrailingComma": true,
   "disallowSpacesInsideParentheses": true,
+  "disallowTrailingComma": true,
   "disallowTrailingWhitespace": true,
+  "requireCamelCaseOrUpperCaseIdentifiers": true,
   "requireCapitalizedConstructors": true,
   "requireCommaBeforeLineBreak": true,
   "requireDotNotation": true,

diff --git a/js/.jshintrc b/js/.jshintrc
@@ -11,6 +11,5 @@
   "nonbsp"   : true,
   "strict"   : true,
   "undef"    : true,
-  "unused"   : true,
-  "predef"   : [ "define", "require" ]
+  "unused"   : true
 }
diff --git a/js/affix.js b/js/affix.js
@@ -7,142 +7,136 @@
  * ======================================================================== */
 
 
-+function () { 'use strict';
++function ($) {
+  'use strict';
 
-  (function (o_o) {
-    typeof define  == 'function' && define.amd ? define(['jquery'], o_o) :
-    typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
-  })(function ($) {
+  // AFFIX CLASS DEFINITION
+  // ======================
 
-    // AFFIX CLASS DEFINITION
-    // ======================
+  var Affix = function (element, options) {
+    this.options = $.extend({}, Affix.DEFAULTS, options)
 
-    var Affix = function (element, options) {
-      this.options = $.extend({}, Affix.DEFAULTS, options)
+    this.$target = $(this.options.target)
+      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
 
-      this.$target = $(this.options.target)
-        .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-        .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
+    this.$element     = $(element)
+    this.affixed      =
+    this.unpin        =
+    this.pinnedOffset = null
 
-      this.$element     = $(element)
-      this.affixed      =
-      this.unpin        =
-      this.pinnedOffset = null
+    this.checkPosition()
+  }
 
-      this.checkPosition()
-    }
-
-    Affix.VERSION  = '3.1.1'
+  Affix.VERSION  = '3.1.1'
 
-    Affix.RESET    = 'affix affix-top affix-bottom'
+  Affix.RESET    = 'affix affix-top affix-bottom'
 
-    Affix.DEFAULTS = {
-      offset: 0,
-      target: window
-    }
+  Affix.DEFAULTS = {
+    offset: 0,
+    target: window
+  }
 
-    Affix.prototype.getPinnedOffset = function () {
-      if (this.pinnedOffset) return this.pinnedOffset
-      this.$element.removeClass(Affix.RESET).addClass('affix')
-      var scrollTop = this.$target.scrollTop()
-      var position  = this.$element.offset()
-      return (this.pinnedOffset = position.top - scrollTop)
-    }
+  Affix.prototype.getPinnedOffset = function () {
+    if (this.pinnedOffset) return this.pinnedOffset
+    this.$element.removeClass(Affix.RESET).addClass('affix')
+    var scrollTop = this.$target.scrollTop()
+    var position  = this.$element.offset()
+    return (this.pinnedOffset = position.top - scrollTop)
+  }
 
-    Affix.prototype.checkPositionWithEventLoop = function () {
-      setTimeout($.proxy(this.checkPosition, this), 1)
-    }
+  Affix.prototype.checkPositionWithEventLoop = function () {
+    setTimeout($.proxy(this.checkPosition, this), 1)
+  }
 
-    Affix.prototype.checkPosition = function () {
-      if (!this.$element.is(':visible')) return
+  Affix.prototype.checkPosition = function () {
+    if (!this.$element.is(':visible')) return
 
-      var scrollHeight = $(document).height()
-      var scrollTop    = this.$target.scrollTop()
-      var position     = this.$element.offset()
-      var offset       = this.options.offset
-      var offsetTop    = offset.top
-      var offsetBottom = offset.bottom
+    var scrollHeight = $(document).height()
+    var scrollTop    = this.$target.scrollTop()
+    var position     = this.$element.offset()
+    var offset       = this.options.offset
+    var offsetTop    = offset.top
+    var offsetBottom = offset.bottom
 
-      if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-      if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
-      if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
+    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
 
-      var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
-                  offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
-                  offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
+    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
+                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
+                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
 
-      if (this.affixed === affix) return
-      if (this.unpin != null) this.$element.css('top', '')
+    if (this.affixed === affix) return
+    if (this.unpin != null) this.$element.css('top', '')
 
-      var affixType = 'affix' + (affix ? '-' + affix : '')
-      var e         = $.Event(affixType + '.bs.affix')
+    var affixType = 'affix' + (affix ? '-' + affix : '')
+    var e         = $.Event(affixType + '.bs.affix')
 
-      this.$element.trigger(e)
+    this.$element.trigger(e)
 
-      if (e.isDefaultPrevented()) return
+    if (e.isDefaultPrevented()) return
 
-      this.affixed = affix
-      this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
 
-      this.$element
-        .removeClass(Affix.RESET)
-        .addClass(affixType)
-        .trigger($.Event(affixType.replace('affix', 'affixed')))
+    this.$element
+      .removeClass(Affix.RESET)
+      .addClass(affixType)
+      .trigger($.Event(affixType.replace('affix', 'affixed')))
 
-      if (affix == 'bottom') {
-        this.$element.offset({
-          top: scrollHeight - this.$element.height() - offsetBottom
-        })
-      }
+    if (affix == 'bottom') {
+      this.$element.offset({
+        top: scrollHeight - this.$element.height() - offsetBottom
+      })
     }
+  }
 
 
-    // AFFIX PLUGIN DEFINITION
-    // =======================
+  // AFFIX PLUGIN DEFINITION
+  // =======================
 
-    function Plugin(option) {
-      return this.each(function () {
-        var $this   = $(this)
-        var data    = $this.data('bs.affix')
-        var options = typeof option == 'object' && option
+  function Plugin(option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.affix')
+      var options = typeof option == 'object' && option
 
-        if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-        if (typeof option == 'string') data[option]()
-      })
-    }
+      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
 
-    var old = $.fn.affix
+  var old = $.fn.affix
 
-    $.fn.affix             = Plugin
-    $.fn.affix.Constructor = Affix
+  $.fn.affix             = Plugin
+  $.fn.affix.Constructor = Affix
 
 
-    // AFFIX NO CONFLICT
-    // =================
+  // AFFIX NO CONFLICT
+  // =================
 
-    $.fn.affix.noConflict = function () {
-      $.fn.affix = old
-      return this
-    }
+  $.fn.affix.noConflict = function () {
+    $.fn.affix = old
+    return this
+  }
 
 
-    // AFFIX DATA-API
-    // ==============
+  // AFFIX DATA-API
+  // ==============
 
-    $(window).on('load', function () {
-      $('[data-spy="affix"]').each(function () {
-        var $spy = $(this)
-        var data = $spy.data()
+  $(window).on('load', function () {
+    $('[data-spy="affix"]').each(function () {
+      var $spy = $(this)
+      var data = $spy.data()
 
-        data.offset = data.offset || {}
+      data.offset = data.offset || {}
 
-        if (data.offsetBottom) data.offset.bottom = data.offsetBottom
-        if (data.offsetTop)    data.offset.top    = data.offsetTop
+      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
+      if (data.offsetTop)    data.offset.top    = data.offsetTop
 
-        Plugin.call($spy, data)
-      })
+      Plugin.call($spy, data)
     })
-
   })
 
-}();
+}(jQuery);