Merge pull request #16896 from twbs/jquery-3

Bootstrap v3 does not currently claim to be compatible with jQuery v3

Merge pull request #16896 from twbs/jquery-3
Bootstrap v3 does not currently claim to be compatible with jQuery v3
76594dbb · Chris Rebert · ef1ce9ac · 9b1a213c · 76594dbb · 76594dbb
Commit 76594dbb authored 9 years ago by Chris Rebert
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 3 deletions
+3 -3
--- a/bower.json
+++ b/bower.json
@@ -29,6 +29,6 @@
    "test-infra"
  ],
  "dependencies": {
-    "jquery": ">= 1.9.1"
+    "jquery": "1.9.1 - 2"
  }
 }
--- a/grunt/configBridge.json
+++ b/grunt/configBridge.json
@@ -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"
    ]