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

Close #670 - Update to jQuery 1.9.1

Browse Source
This commit is contained in:
Ben Word
2013-02-08 09:47:08 -06:00
parent 4093095dc7
commit bc52a4e09b
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

5
assets/js/vendor/jquery-1.9.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
doc/lib.md
View File

@@ -87,7 +87,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. `jquery-1.9.0.min.js` via Google CDN with local fallback 1. `jquery-1.9.1.min.js` via Google CDN with local fallback
2. `/theme/assets/js/vendor/modernizr-2.6.2.min.js` 2. `/theme/assets/js/vendor/modernizr-2.6.2.min.js`
3. `/theme/assets/js/plugins.js` (in footer) 3. `/theme/assets/js/plugins.js` (in footer)
4. `/theme/assets/js/main.js` (in footer) 4. `/theme/assets/js/main.js` (in footer)

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.9.0.min.js │ ├── jquery-1.9.1.min.js
│ └── modernizr-2.6.2.min.js │ └── modernizr-2.6.2.min.js
├── doc ├── doc
├── lang ├── lang

6
lib/scripts.php
View File

@@ -9,7 +9,7 @@
* 4. /child-theme/style.css (if a child theme is activated) * 4. /child-theme/style.css (if a child theme is activated)
* *
* Enqueue scripts in the following order: * Enqueue scripts in the following order:
* 1. jquery-1.9.0.min.js via Google CDN * 1. jquery-1.9.1.min.js via Google CDN
* 2. /theme/assets/js/vendor/modernizr-2.6.2.min.js * 2. /theme/assets/js/vendor/modernizr-2.6.2.min.js
* 3. /theme/assets/js/plugins.js (in footer) * 3. /theme/assets/js/plugins.js (in footer)
* 4. /theme/assets/js/main.js (in footer) * 4. /theme/assets/js/main.js (in footer)
@@ -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', '//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js', false, null, false); wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js', false, null, false);
} }
if (is_single() && comments_open() && get_option('thread_comments')) { if (is_single() && comments_open() && get_option('thread_comments')) {
@@ -53,7 +53,7 @@ function roots_jquery_local_fallback($src, $handle) {
static $add_jquery_fallback = false; static $add_jquery_fallback = false;
if ($add_jquery_fallback) { if ($add_jquery_fallback) {
echo '<script>window.jQuery || document.write(\'<script src="' . get_template_directory_uri() . '/assets/js/vendor/jquery-1.9.0.min.js"><\/script>\')</script>' . "\n"; echo '<script>window.jQuery || document.write(\'<script src="' . get_template_directory_uri() . '/assets/js/vendor/jquery-1.9.1.min.js"><\/script>\')</script>' . "\n";
$add_jquery_fallback = false; $add_jquery_fallback = false;
} }