Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Fenkart <hnrch02@gmail.com>2014-11-03 18:19:40 +0300
committerHeinrich Fenkart <hnrch02@gmail.com>2014-11-04 14:35:38 +0300
commitd10700427805c40497b24d7f4ffdd58a7a83c997 (patch)
tree174a24e92abf711a30b61c175b59a6a728fee191 /docs/assets/js/src/customizer.js
parent203912b9c500c44e3091093965fc4dc4ffeef7ff (diff)
Remove duplicate code from Customizer/Gruntfile by sharing it
Diffstat (limited to 'docs/assets/js/src/customizer.js')
-rw-r--r--docs/assets/js/src/customizer.js19
1 files changed, 4 insertions, 15 deletions
diff --git a/docs/assets/js/src/customizer.js b/docs/assets/js/src/customizer.js
index 8d9f5f7e0a..b2f15dfa03 100644
--- a/docs/assets/js/src/customizer.js
+++ b/docs/assets/js/src/customizer.js
@@ -6,13 +6,13 @@
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
-/* global JSZip, less, saveAs, UglifyJS, __js, __less, __fonts */
+/* global JSZip, less, saveAs, UglifyJS, __configBridge, __js, __less, __fonts */
window.onload = function () { // wait for load in a dumb way because B-0
'use strict';
var cw = '/*!\n' +
' * Bootstrap v3.3.0 (http://getbootstrap.com)\n' +
- ' * Copyright 2011-2014 Twitter, Inc.\n' +
+ ' * Copyright 2011-' + new Date().getFullYear() + ' Twitter, Inc.\n' +
' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
' */\n\n'
@@ -319,19 +319,8 @@ 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 jQuery === \'undefined\') {',
- ' throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\')',
- '}\n'
- ].join('\n')
- var jqueryVersionCheck = [
- '+function ($) {',
- ' var version = $.fn.jquery.split(\' \')[0].split(\'.\')',
- ' if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {',
- ' throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 1.9.1 or higher\')',
- ' }',
- '}(jQuery);\n\n'
- ].join('\n')
+ var jqueryCheck = __configBridge.jqueryCheck.join('\n')
+ var jqueryVersionCheck = __configBridge.jqueryVersionCheck.join('\n')
if (!$checked.length) return false