Close roots#635 - Update to jQuery 1.9.0

WordpressDev · Jan 15, 2013 · 2ed9738 · 2ed9738
1 parent 3b0bb0d
commit 2ed9738
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### HEAD
+* Update to jQuery 1.9.0
+
 ### 6.2.0: January 13th, 2013
 * Implement latest Nice Search
 * Update [gallery] shortcode

diff --git a/assets/js/vendor/jquery-1.8.3.min.js b/assets/js/vendor/jquery-1.8.3.min.js
diff --git a/assets/js/vendor/jquery-1.9.0.min.js b/assets/js/vendor/jquery-1.9.0.min.js
diff --git a/doc/lib.md b/doc/lib.md
@@ -83,7 +83,7 @@ If you're using LESS, make sure you compile the files to the proper locations:
 JavaScript is loaded in the following order:
 
 1. `/theme/assets/js/vendor/modernizr-2.6.2.min.js` (in `head.php`)
-2. `jquery-1.8.3.min.js` via Google CDN with local fallback (in `head.php`)
+2. `jquery-1.9.0.min.js` via Google CDN with local fallback (in `head.php`)
 3. `/theme/assets/js/plugins.js`
 4. `/theme/assets/js/main.js`
 

diff --git a/doc/usage.md b/doc/usage.md
@@ -28,7 +28,7 @@ A basic Roots theme initially looks like this:
 │       ├── main.js
 │       ├── plugins.js (includes bootstrap.js)
 │       └── vendor
-│           ├── jquery-1.8.3.min.js
+│           ├── jquery-1.9.0.min.js
 │           └── modernizr-2.6.2.min.js
 ├── doc
 ├── lang

diff --git a/lib/h5bp-htaccess b/lib/h5bp-htaccess
@@ -142,7 +142,7 @@ AddType application/x-shockwave-flash       swf
 # ----------------------------------------------------------------------
 
 # e.g. Inside of script.combined.js you could have
-#   <!--#include file="libs/jquery-1.8.3.min.js" -->
+#   <!--#include file="libs/jquery.min.js" -->
 #   <!--#include file="plugins/jquery.idletimer.js" -->
 # and they would be included into this single file.
 

diff --git a/lib/scripts.php b/lib/scripts.php
@@ -10,7 +10,7 @@
  *
  * Enqueue scripts in the following order:
  * 1. /theme/assets/js/vendor/modernizr-2.6.2.min.js  (in head.php)
- * 2. jquery-1.8.2.min.js via Google CDN              (in head.php)
+ * 2. jquery-1.9.0.min.js via Google CDN              (in head.php)
  * 3. /theme/assets/js/plugins.js
  * 4. /theme/assets/js/main.js
  */
@@ -30,7 +30,7 @@ function roots_scripts() {
   // It's kept in the header instead of footer to avoid conflicts with plugins.
   if (!is_admin()) {
     wp_deregister_script('jquery');
-    wp_register_script('jquery', '', '', '1.8.3', false);
+    wp_register_script('jquery', '', '', '1.9.0', false);
   }
 
   if (is_single() && comments_open() && get_option('thread_comments')) {

diff --git a/templates/head.php b/templates/head.php
@@ -10,8 +10,8 @@
 
   <script src="<?php echo get_template_directory_uri(); ?>/assets/js/vendor/modernizr-2.6.2.min.js"></script>
 
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
-  <script>window.jQuery || document.write('<script src="<?php echo get_template_directory_uri(); ?>/assets/js/vendor/jquery-1.8.3.min.js"><\/script>')</script>
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+  <script>window.jQuery || document.write('<script src="<?php echo get_template_directory_uri(); ?>/assets/js/vendor/jquery-1.9.0.min.js"><\/script>')</script>
 
   <?php wp_head(); ?>