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

Remove DIST_DIR constant

Browse Source
This commit is contained in:
Ben Word
2015-10-10 22:33:44 -05:00
parent e1e252472a
commit da51434648
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/assets.php
View File

@@ -41,13 +41,13 @@ class JsonManifest {
} }
function asset_path($filename) { function asset_path($filename) {
$dist_path = get_template_directory_uri() . DIST_DIR; $dist_path = get_template_directory_uri() . '/dist/';
$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_DIR . 'assets.json'; $manifest_path = get_template_directory() . '/dist/' . 'assets.json';
$manifest = new JsonManifest($manifest_path); $manifest = new JsonManifest($manifest_path);
} }

8
lib/setup.php
View File

@@ -13,14 +13,6 @@ 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-nice-search'); // Enable nice search from Soil
add_theme_support('soil-jquery-cdn'); // Enable to load jQuery from the Google CDN add_theme_support('soil-jquery-cdn'); // Enable to load jQuery from the Google CDN
/**
* Configuration values
*/
if (!defined('DIST_DIR')) {
// Path to the build directory for front-end assets
define('DIST_DIR', '/dist/');
}
/** /**
* Theme setup * Theme setup
*/ */