Merge pull request #17494 from twbs/v4-dev-xmr-jquery-2.x

Switch to jQuery 2.x.x.
twbs · Oct 26, 2015 · b0aa102 · b0aa102
2 parents 2332a3f + 9eded91
commit b0aa102
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 43 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -46,8 +46,8 @@ module.exports = function (grunt) {
  '}\n',
  jqueryVersionCheck: '+function ($) {\n' +
  ' var version = $.fn.jquery.split(\' \')[0].split(\'.\')\n' +
- ' if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {\n' +
- ' throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 1.9.1 or higher\')\n' +
+ ' if (version[0] !== \'2\') {\n' +
+ ' throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 2.x.x\')\n' +
  ' }\n' +
  '}(jQuery);\n\n',
 

diff --git a/bower.json b/bower.json
@@ -29,6 +29,6 @@
  "test-infra"
  ],
  "dependencies": {
- "jquery": "1.9.1 - 2"
+ "jquery": "2"
  }
 }
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
@@ -11,7 +11,7 @@
  </div>
 </footer>
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+<script src="{{ site.cdn.jquery }}"></script>
 <script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery.min.js"><\/script>')</script>
 
 {% if site.github %}

diff --git a/docs/assets/js/vendor/jquery.min.js b/docs/assets/js/vendor/jquery.min.js
diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html
@@ -115,7 +115,7 @@ <h1 class="jumbotron-heading">Album example</h1>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../assets/js/vendor/holder.min.js"></script>
  <script>

diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html
@@ -160,7 +160,7 @@ <h4>Elsewhere</h4>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
@@ -174,7 +174,7 @@ <h2 class="featurette-heading">And lastly, this one. <span class="text-muted">Ch
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- Just to make our placeholder images work. Don't actually copy the next line! -->

diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html
@@ -60,7 +60,7 @@ <h1 class="cover-heading">Cover your page.</h1>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
@@ -224,7 +224,7 @@ <h2>Section title</h2>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- Just to make our placeholder images work. Don't actually copy the next line! -->

diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html
@@ -75,7 +75,7 @@ <h2>Heading</h2>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html
@@ -45,7 +45,7 @@ <h1>Navbar example</h1>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html
@@ -43,7 +43,7 @@ <h1>Navbar example</h1>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html
@@ -64,7 +64,7 @@ <h1>Navbar example</h1>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html
@@ -104,7 +104,7 @@ <h2>Heading</h2>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html
@@ -48,7 +48,7 @@ <h1>Bootstrap starter template</h1>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
@@ -73,7 +73,7 @@ <h1>Sticky footer with fixed navbar</h1>
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html
@@ -39,7 +39,7 @@
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
  <script src="../../dist/js/bootstrap.min.js"></script>
  <script src="../../assets/js/vendor/tether.min.js"></script>

diff --git a/grunt/configBridge.json b/grunt/configBridge.json
@@ -7,21 +7,5 @@
  "../assets/js/vendor/tether.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"
- ]
  }
 }
diff --git a/js/tests/vendor/jquery.min.js b/js/tests/vendor/jquery.min.js