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

Merge pull request #557 from retlehs/jquery-1.8.2

Browse Source 
Update to jQuery 1.8.2
This commit is contained in:
Scott Walkinshaw
2012-09-21 12:57:29 -07:00
parent 671cb95ebc 81d1c8dd9e
commit b2c340da05
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,4 +1,5 @@
### HEAD
* Update to jQuery 1.8.2
* Refactor/simplify Roots vCard Widget
* Move custom entry_meta code into template
* Move Google Analytics code into footer template

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

File diff suppressed because one or more lines are too long

2
assets/js/vendor/jquery-1.8.2.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
doc/lib.md
View File

@@ -84,7 +84,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.1.min.js` (in `head.php`)
2. `jquery-1.8.0.min.js` via Google CDN with local fallback (in `head.php`)
2. `jquery-1.8.2.min.js` via Google CDN with local fallback (in `head.php`)
3. `/theme/assets/js/plugins.js`
4. `/theme/assets/js/main.js`

4
doc/usage.md
View File

@@ -28,7 +28,7 @@ A basic Roots theme initially looks like this:
│ ├── main.js
│ ├── plugins.js (includes bootstrap.js)
│ └── vendor
│ ├── jquery-1.8.0.min.js
│ ├── jquery-1.8.2.min.js
│ └── modernizr-2.6.1.min.js
├── doc
├── lang
@@ -137,4 +137,4 @@ This file is used to serve the single post template.
### style.css
This file is used to tell WordPress that we're a theme. None of the actual CSS is contained in this file.
This file is used to tell WordPress that we're a theme. None of the actual CSS is contained in this file.

4
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
# <!--#include file="libs/jquery-1.5.0.min.js" -->
# <!--#include file="libs/jquery-1.8.2.min.js" -->
# <!--#include file="plugins/jquery.idletimer.js" -->
# and they would be included into this single file.
@@ -582,4 +582,4 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
php_value session.cookie_httponly true
</IfModule>
# END HTML5 Boilerplate
# END HTML5 Boilerplate

4
lib/scripts.php
View File

@@ -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.1.min.js via Google CDN (in head.php)
* 2. jquery-1.8.2.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.1', false);
wp_register_script('jquery', '', '', '1.8.2', false);
}
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="//ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="<?php echo get_template_directory_uri(); ?>/assets/js/vendor/jquery-1.8.1.min.js"><\/script>')</script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="<?php echo get_template_directory_uri(); ?>/assets/js/vendor/jquery-1.8.2.min.js"><\/script>')</script>
<?php wp_head(); ?>