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

Move jQuery CDN feature to Soil

Browse Source
This commit is contained in:
Ben Word
2015-04-12 18:58:12 -05:00
parent 49c310b2c6
commit 22329a401c
4 changed files with 9 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
lib/assets.php
View File

@@ -9,13 +9,8 @@ namespace Roots\Sage\Assets;
* 1. /theme/dist/styles/main.css
*
* Enqueue scripts in the following order:
* 1. Latest jQuery via Google CDN (if enabled in config.php)
* 2. /theme/dist/scripts/modernizr.js
* 3. /theme/dist/scripts/main.js
*
* Google Analytics is loaded after enqueued scripts if:
* - An ID has been defined in config.php
* - You're not logged in as an administrator
* 1. /theme/dist/scripts/modernizr.js
* 2. /theme/dist/scripts/main.js
*/
class JsonManifest {
@@ -70,74 +65,14 @@ function asset_path($filename) {
}
}
function bower_map_to_cdn($dependency, $fallback) {
static $bower;
if (empty($bower)) {
$bower_path = get_template_directory() . '/bower.json';
$bower = new JsonManifest($bower_path);
}
$templates = [
'google' => '//ajax.googleapis.com/ajax/libs/%name%/%version%/%file%'
];
$version = $bower->getPath('dependencies.' . $dependency['name']);
if (isset($version) && preg_match('/^(\d+\.){2}\d+$/', $version)) {
$search = ['%name%', '%version%', '%file%'];
$replace = [$dependency['name'], $version, $dependency['file']];
return str_replace($search, $replace, $templates[$dependency['cdn']]);
} else {
return $fallback;
}
}
function assets() {
wp_enqueue_style('sage_css', asset_path('styles/main.css'), false, null);
/**
* Grab Google CDN's latest jQuery with a protocol relative URL; fallback to local if offline
* jQuery & Modernizr load in the footer per HTML5 Boilerplate's recommendation: http://goo.gl/nMGR7P
* If a plugin enqueues jQuery-dependent scripts in the head, jQuery will load in the head to meet the plugin's dependencies
* To explicitly load jQuery in the head, change the last wp_enqueue_script parameter to false
*/
if (!is_admin() && current_theme_supports('jquery-cdn')) {
wp_deregister_script('jquery');
wp_register_script('jquery', bower_map_to_cdn([
'name' => 'jquery',
'cdn' => 'google',
'file' => 'jquery.min.js'
], asset_path('scripts/jquery.js')), [], null, true);
add_filter('script_loader_src', __NAMESPACE__ . '\\jquery_local_fallback', 10, 2);
}
if (is_single() && comments_open() && get_option('thread_comments')) {
wp_enqueue_script('comment-reply');
}
wp_enqueue_script('modernizr', asset_path('scripts/modernizr.js'), [], null, true);
wp_enqueue_script('jquery');
wp_enqueue_script('sage_js', asset_path('scripts/main.js'), [], null, true);
wp_enqueue_script('sage_js', asset_path('scripts/main.js'), ['jquery'], null, true);
}
add_action('wp_enqueue_scripts', __NAMESPACE__ . '\\assets', 100);
// http://wordpress.stackexchange.com/a/12450
function jquery_local_fallback($src, $handle = null) {
static $add_jquery_fallback = false;
if ($add_jquery_fallback) {
echo '<script>window.jQuery || document.write(\'<script src="' . $add_jquery_fallback .'"><\/script>\')</script>' . "\n";
$add_jquery_fallback = false;
}
if ($handle === 'jquery') {
$add_jquery_fallback = apply_filters('script_loader_src', asset_path('scripts/jquery.js'), 'jquery-fallback');
}
return $src;
}
add_action('wp_head', __NAMESPACE__ . '\\jquery_local_fallback');

2
lib/config.php
View File

@@ -10,8 +10,8 @@ use Roots\Sage\ConditionalTagCheck;
add_theme_support('soil-clean-up'); // Enable clean up from Soil
add_theme_support('soil-relative-urls'); // Enable relative URLs from Soil
add_theme_support('soil-nice-search'); // Enable nice search from Soil
add_theme_support('soil-jquery-cdn'); // Enable to load jQuery from the Google CDN
add_theme_support('bootstrap-gallery'); // Enable Bootstrap's thumbnails component on [gallery]
add_theme_support('jquery-cdn'); // Enable to load jQuery from the Google CDN
/**
* Configuration values