mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 02:54:01 +02:00
Code Issues Releases Wiki Activity

Merge pull request #13904 from twbs/revert-umd

Browse Source 
Revert UMD for now, due to #13812.
This commit is contained in:
Jacob
2014-06-23 22:54:44 -07:00
parent 25b06d927f c2c19a4d2d
commit b31c35b636
17 changed files with 1710 additions and 1782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@@ -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: {

2
dist/js/bootstrap.js vendored
View File

@@ -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

2
docs/assets/js/_src/customizer.js
View File

@@ -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

3
js/.jscsrc
View File

@@ -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,

3
js/.jshintrc
View File

@@ -11,6 +11,5 @@
"nonbsp" : true,
"strict" : true,
"undef" : true,
"unused" : true,
"predef" : [ "define", "require" ]
"unused" : true
}

12
js/affix.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// AFFIX CLASS DEFINITION
// ======================
@@ -143,6 +139,4 @@
})
})
})
}();
}(jQuery);

12
js/alert.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// ALERT CLASS DEFINITION
// ======================
@@ -93,6 +89,4 @@
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
})
}();
}(jQuery);

12
js/button.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// BUTTON PUBLIC CLASS DEFINITION
// ==============================
@@ -111,6 +107,4 @@
e.preventDefault()
})
})
}();
}(jQuery);

12
js/carousel.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// CAROUSEL CLASS DEFINITION
// =========================
@@ -223,6 +219,4 @@
})
})
})
}();
}(jQuery);

12
js/collapse.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// COLLAPSE PUBLIC CLASS DEFINITION
// ================================
@@ -171,6 +167,4 @@
Plugin.call($target, option)
})
})
}();
}(jQuery);

12
js/dropdown.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// DROPDOWN CLASS DEFINITION
// =========================
@@ -152,6 +148,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);

12
js/modal.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// MODAL CLASS DEFINITION
// ======================
@@ -281,6 +277,4 @@
Plugin.call($target, option, this)
})
})
}();
}(jQuery);

12
js/popover.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// POPOVER PUBLIC CLASS DEFINITION
// ===============================
@@ -114,6 +110,4 @@
return this
}
})
}();
}(jQuery);

12
js/scrollspy.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// SCROLLSPY CLASS DEFINITION
// ==========================
@@ -171,6 +167,4 @@
})
})
})
}();
}(jQuery);

12
js/tab.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// TAB CLASS DEFINITION
// ====================
@@ -129,6 +125,4 @@
Plugin.call($(this), 'show')
})
})
}();
}(jQuery);

12
js/tooltip.js
View File

@@ -8,12 +8,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// TOOLTIP PUBLIC CLASS DEFINITION
// ===============================
@@ -458,6 +454,4 @@
return this
}
})
}();
}(jQuery);

12
js/transition.js
View File

@@ -7,12 +7,8 @@
* ======================================================================== */
+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 ($) {
+function ($) {
'use strict';
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
// ============================================================
@@ -60,6 +56,4 @@
}
})
})
}();
}(jQuery);