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

Merge pull request #956 from roscius/register_script

Browse Source 
Match wp_register_script function signature
This commit is contained in:
Foxaii
2014-01-04 10:48:45 -08:00
parent 72cc5550d1 940b8b5399
commit 39dd0d2499
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/scripts.php
View File

@@ -18,7 +18,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() && current_theme_supports('jquery-cdn')) { if (!is_admin() && current_theme_supports('jquery-cdn')) {
wp_deregister_script('jquery'); wp_deregister_script('jquery');
wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js', false, null, false); wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js', array(), null, false);
add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2); add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2);
} }
@@ -26,8 +26,8 @@ function roots_scripts() {
wp_enqueue_script('comment-reply'); wp_enqueue_script('comment-reply');
} }
wp_register_script('modernizr', get_template_directory_uri() . '/assets/js/vendor/modernizr-2.7.0.min.js', false, null, false); wp_register_script('modernizr', get_template_directory_uri() . '/assets/js/vendor/modernizr-2.7.0.min.js', array(), null, false);
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '01d073428e4e54f227f8a0a3bad4b804', true); wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', array(), '01d073428e4e54f227f8a0a3bad4b804', true);
wp_enqueue_script('modernizr'); wp_enqueue_script('modernizr');
wp_enqueue_script('jquery'); wp_enqueue_script('jquery');
wp_enqueue_script('roots_scripts'); wp_enqueue_script('roots_scripts');