diff options
| author |   Dererk <dererk@satellogic.com> | 2016-11-15 14:18:53 -0300 |
|---|---|---|
| committer | Dererk <dererk@satellogic.com> | 2016-11-15 14:18:53 -0300 |
| commit | 1ad5102b7ddd181bb9c632b124d3ea4c7db28be6 (patch) | |
| tree | 73dda18465d0f4b8eb52d4482282a387c9f67c95 /bower_components/bootstrap/grunt/configBridge.json | |
| parent | b67294f76809a681ff73f209ed691a3e3f00563d (diff) | |
| parent | ffb671c61a24a9086343b54bad080e145ff33fc5 (diff) | |
Merge tag 'upstream/7.8.1'
Upstream version 7.8.1
# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg: usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg: alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg: alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg: alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]
Diffstat (limited to 'bower_components/bootstrap/grunt/configBridge.json')
| -rw-r--r-- | bower_components/bootstrap/grunt/configBridge.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bower_components/bootstrap/grunt/configBridge.json b/bower_components/bootstrap/grunt/configBridge.json index 8ce4c3d..9d1a142 100644 --- a/bower_components/bootstrap/grunt/configBridge.json +++ b/bower_components/bootstrap/grunt/configBridge.json @@ -13,7 +13,7 @@ "docsJs": [ "../assets/js/vendor/holder.min.js", "../assets/js/vendor/ZeroClipboard.min.js", - "../assets/js/vendor/anchor.js", + "../assets/js/vendor/anchor.min.js", "../assets/js/src/application.js" ] }, @@ -37,10 +37,10 @@ "+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)) {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher')", + " if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 3)) {", + " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4')", " }", "}(jQuery);\n\n" ] } -}
\ No newline at end of file +} |