framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close #635 - Update to jQuery 1.9.0

Browse Source
This commit is contained in:
Ben Word
2013-01-15 12:22:21 -06:00
parent 3b0bb0d5d8
commit 2ed9738afd
8 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,3 +1,6 @@
### HEAD
* Update to jQuery 1.9.0
### 6.2.0: January 13th, 2013 ### 6.2.0: January 13th, 2013
* Implement latest Nice Search * Implement latest Nice Search
* Update [gallery] shortcode * Update [gallery] shortcode

2
assets/js/vendor/jquery-1.8.3.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
assets/js/vendor/jquery-1.9.0.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
doc/lib.md
View File

@@ -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: JavaScript is loaded in the following order:
1. `/theme/assets/js/vendor/modernizr-2.6.2.min.js` (in `head.php`) 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` 3. `/theme/assets/js/plugins.js`
4. `/theme/assets/js/main.js` 4. `/theme/assets/js/main.js`

2
doc/usage.md
View File

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

2
lib/h5bp-htaccess
View File

@@ -142,7 +142,7 @@ AddType application/x-shockwave-flash swf
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# e.g. Inside of script.combined.js you could have # 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" --> # <!--#include file="plugins/jquery.idletimer.js" -->
# and they would be included into this single file. # and they would be included into this single file.

4
lib/scripts.php
View File

@@ -10,7 +10,7 @@
* *
* Enqueue scripts in the following order: * Enqueue scripts in the following order:
* 1. /theme/assets/js/vendor/modernizr-2.6.2.min.js (in head.php) * 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 * 3. /theme/assets/js/plugins.js
* 4. /theme/assets/js/main.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. // It's kept in the header instead of footer to avoid conflicts with plugins.
if (!is_admin()) { if (!is_admin()) {
wp_deregister_script('jquery'); 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')) { if (is_single() && comments_open() && get_option('thread_comments')) {

4
templates/head.php
View File

@@ -10,8 +10,8 @@
<script src="<?php echo get_template_directory_uri(); ?>/assets/js/vendor/modernizr-2.6.2.min.js"></script> <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 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.8.3.min.js"><\/script>')</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(); ?> <?php wp_head(); ?>