diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
| commit | 5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4 (patch) | |
| tree | 2951782d8d0aadb61dae9122d0f508a75ed8e7eb /grunt/configBridge.json | |
| parent | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (diff) | |
| parent | afbaf4350560eaf2135fb0dc6dd761ebb746ac40 (diff) | |
| download | bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.tar.xz bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1
Diffstat (limited to 'grunt/configBridge.json')
| -rw-r--r-- | grunt/configBridge.json | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 82e3ce06c..2bda83394 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -1,27 +1,10 @@ { "paths": { "docsJs": [ - "../assets/js/vendor/holder.min.js", - "../assets/js/vendor/ZeroClipboard.min.js", "../assets/js/vendor/anchor.min.js", - "../assets/js/vendor/tether.min.js", + "../assets/js/vendor/clipboard.min.js", + "../assets/js/vendor/holder.min.js", "../assets/js/src/application.js" ] - }, - "config": { - "jqueryCheck": [ - "if (typeof jQuery === 'undefined') {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery')", - "}\n" - ], - "jqueryVersionCheck": [ - "+function ($) {", - " 'use strict';", - " var version = $.fn.jquery.split(' ')[0].split('.')", - " if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')", - " }", - "}(jQuery);\n\n" - ] } } |