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

Merge master

Browse Source
This commit is contained in:
Ben Word
2014-10-24 17:56:17 -05:00
parent 9b8eb85fb6 246594f230
commit 7dd0f0b755
17 changed files with 62 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/scripts.php
View File

@@ -8,7 +8,7 @@
* Enqueue scripts in the following order:
* 1. jquery-1.11.1.min.js via Google CDN
* 2. /theme/assets/js/vendor/modernizr.min.js
* 3. /theme/assets/js/scripts.js (in footer)
* 3. /theme/assets/js/scripts.js
*
* Google Analytics is loaded after enqueued scripts if:
* - An ID has been defined in config.php
@@ -46,7 +46,7 @@ function roots_scripts() {
*/
if (!is_admin() && current_theme_supports('jquery-cdn')) {
wp_deregister_script('jquery');
wp_register_script('jquery', $assets['jquery'], array(), null, false);
wp_register_script('jquery', $assets['jquery'], array(), null, true);
add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2);
}
@@ -54,7 +54,7 @@ function roots_scripts() {
wp_enqueue_script('comment-reply');
}
wp_enqueue_script('modernizr', get_template_directory_uri() . $assets['modernizr'], array(), null, false);
wp_enqueue_script('modernizr', get_template_directory_uri() . $assets['modernizr'], array(), null, true);
wp_enqueue_script('jquery');
wp_enqueue_script('roots_js', get_template_directory_uri() . $assets['js'], array(), null, true);
}