diff options
| -rw-r--r-- | js/.jscsrc | 3 | ||||
| -rw-r--r-- | js/.jshintrc | 4 | ||||
| -rw-r--r-- | js/affix.js | 8 | ||||
| -rw-r--r-- | js/alert.js | 8 | ||||
| -rw-r--r-- | js/button.js | 8 | ||||
| -rw-r--r-- | js/carousel.js | 8 | ||||
| -rw-r--r-- | js/collapse.js | 8 | ||||
| -rw-r--r-- | js/dropdown.js | 8 | ||||
| -rw-r--r-- | js/modal.js | 8 | ||||
| -rw-r--r-- | js/popover.js | 8 | ||||
| -rw-r--r-- | js/scrollspy.js | 8 | ||||
| -rw-r--r-- | js/tab.js | 8 | ||||
| -rw-r--r-- | js/tooltip.js | 8 | ||||
| -rw-r--r-- | js/transition.js | 8 |
14 files changed, 75 insertions, 28 deletions
diff --git a/js/.jscsrc b/js/.jscsrc index fb6cd10c2..e6eb84560 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -11,10 +11,9 @@ "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true }, "disallowSpacesInsideArrayBrackets": true, - "disallowSpacesInsideParentheses": true, "disallowTrailingComma": true, + "disallowSpacesInsideParentheses": true, "disallowTrailingWhitespace": true, - "requireCamelCaseOrUpperCaseIdentifiers": true, "requireCapitalizedConstructors": true, "requireCommaBeforeLineBreak": true, "requireDotNotation": true, diff --git a/js/.jshintrc b/js/.jshintrc index a59e1d00a..0cf661ddc 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -9,7 +9,7 @@ "latedef" : true, "laxbreak" : true, "nonbsp" : true, - "strict" : true, "undef" : true, - "unused" : true + "unused" : true, + "predef" : [ "define", "require" ] } diff --git a/js/affix.js b/js/affix.js index 5af32fee6..d5f591fb5 100644 --- a/js/affix.js +++ b/js/affix.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // AFFIX CLASS DEFINITION @@ -139,4 +143,4 @@ }) }) -}(jQuery); +}); diff --git a/js/alert.js b/js/alert.js index 905aacc15..f7fc6fb8e 100644 --- a/js/alert.js +++ b/js/alert.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // ALERT CLASS DEFINITION @@ -89,4 +93,4 @@ $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) -}(jQuery); +}); diff --git a/js/button.js b/js/button.js index aa7145072..cab7d8c3d 100644 --- a/js/button.js +++ b/js/button.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // BUTTON PUBLIC CLASS DEFINITION @@ -107,4 +111,4 @@ e.preventDefault() }) -}(jQuery); +}); diff --git a/js/carousel.js b/js/carousel.js index f0117980d..af51cf50d 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // CAROUSEL CLASS DEFINITION @@ -209,4 +213,4 @@ }) }) -}(jQuery); +}); diff --git a/js/collapse.js b/js/collapse.js index 87098dbd2..d5d74d07b 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // COLLAPSE PUBLIC CLASS DEFINITION @@ -178,4 +182,4 @@ Plugin.call($target, option) }) -}(jQuery); +}); diff --git a/js/dropdown.js b/js/dropdown.js index bc671fef0..39d2951eb 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // DROPDOWN CLASS DEFINITION @@ -148,4 +152,4 @@ .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) .on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown) -}(jQuery); +}); diff --git a/js/modal.js b/js/modal.js index f23ba825f..2c363ec33 100644 --- a/js/modal.js +++ b/js/modal.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // MODAL CLASS DEFINITION @@ -277,4 +281,4 @@ Plugin.call($target, option, this) }) -}(jQuery); +}); diff --git a/js/popover.js b/js/popover.js index c8ec3bef4..8d2840c2e 100644 --- a/js/popover.js +++ b/js/popover.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // POPOVER PUBLIC CLASS DEFINITION @@ -110,4 +114,4 @@ return this } -}(jQuery); +}); diff --git a/js/scrollspy.js b/js/scrollspy.js index d527e9c2d..78858680e 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // SCROLLSPY CLASS DEFINITION @@ -157,4 +161,4 @@ }) }) -}(jQuery); +}); @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // TAB CLASS DEFINITION @@ -125,4 +129,4 @@ Plugin.call($(this), 'show') }) -}(jQuery); +}); diff --git a/js/tooltip.js b/js/tooltip.js index b4ced6d2a..692651457 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -8,7 +8,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // TOOLTIP PUBLIC CLASS DEFINITION @@ -454,4 +458,4 @@ return this } -}(jQuery); +}); diff --git a/js/transition.js b/js/transition.js index e8c8f992f..8fcf8ff4b 100644 --- a/js/transition.js +++ b/js/transition.js @@ -7,7 +7,11 @@ * ======================================================================== */ -+function ($) { +(function (o_o) { + typeof define === 'function' && define.amd ? define(['jquery'], o_o) : + typeof exports === 'object' ? o_o(require('jquery')) : o_o(this.jQuery) +})(function ($) { + 'use strict'; // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) @@ -46,4 +50,4 @@ $.support.transition = transitionEnd() }) -}(jQuery); +}); |