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

Merge pull request #1 from austinpray/distvar

Browse Source 
dist_var -> dist_dir
This commit is contained in:
Daniel Olson
2015-02-26 18:21:39 -05:00
parent c64d70f1bb 12d0f21e03
commit 6cc7b7f189
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/assets.php
View File

@@ -53,14 +53,14 @@ class JsonManifest {
} }
function asset_path($filename) { function asset_path($filename) {
$dist_var = '/dist/'; $dist_dir = '/dist/';
$dist_path = get_template_directory_uri() . $dist_var; $dist_path = get_template_directory_uri() . $dist_dir;
$directory = dirname($filename) . '/'; $directory = dirname($filename) . '/';
$file = basename($filename); $file = basename($filename);
static $manifest; static $manifest;
if (empty($manifest)) { if (empty($manifest)) {
$manifest_path = get_template_directory() . $dist_var . 'assets.json'; $manifest_path = get_template_directory() . $dist_dir . 'assets.json';
$manifest = new JsonManifest($manifest_path); $manifest = new JsonManifest($manifest_path);
} }
@@ -131,7 +131,7 @@ function jquery_local_fallback($src, $handle = null) {
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() . $dist_var . 'scripts/jquery.js"><\/script>\')</script>' . "\n"; echo '<script>window.jQuery || document.write(\'<script src="' . get_template_directory_uri() . $dist_dir . 'scripts/jquery.js"><\/script>\')</script>' . "\n";
$add_jquery_fallback = false; $add_jquery_fallback = false;
} }