]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Bootstrap v3 does not currently claim to be compatible with jQuery v3; closes #16834 16896/head
authorChris Rebert <code@rebertia.com>
Mon, 27 Jul 2015 23:35:02 +0000 (16:35 -0700)
committerChris Rebert <code@rebertia.com>
Mon, 27 Jul 2015 23:35:04 +0000 (16:35 -0700)
[skip sauce]
[skip validator]

bower.json
grunt/configBridge.json

index 686bcf1ae23027bf8a07f16e1506b07f35f3d4b3..58ae0935bad342fa9b17fb6dc579058a11b14553 100644 (file)
@@ -29,6 +29,6 @@
     "test-infra"
   ],
   "dependencies": {
-    "jquery": ">= 1.9.1"
+    "jquery": "1.9.1 - 2"
   }
 }
index 8ce4c3d9a39cb201d2dfbd58f414d5693824c505..0d93f4a66c022b24c55069a61e270fd249683c88 100644 (file)
@@ -37,8 +37,8 @@
       "+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] > 2)) {",
+      "    throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')",
       "  }",
       "}(jQuery);\n\n"
     ]