JuanCanham/HackMyResume
1
0
Fork 0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2024-11-22 08:20:11 +00:00
Code Issues Releases Wiki Activity

Introduce FRESH theme/format inheritance.

Browse Source 
Support "inherits" property in theme.json (FRESH themes only).
This commit is contained in:
hacksalot 2016-01-05 06:34:56 -05:00
parent 3f40441b0a
commit d205e882f6
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/fresh-theme.js
View File

@ -53,14 +53,26 @@ Definition of the FRESHTheme class.
// Move properties from the theme JSON file to the theme object
EXTEND( true, this, themeInfo );
// Check for an "inherits" entry in the theme JSON.
if( this.inherits ) {
var cached = { };
_.each( this.inherits, function(th, key) {
var themesFolder = require.resolve('fresh-themes');
var d = parsePath( themeFolder ).dirname;
var themePath = PATH.join(d, th);
cached[ th ] = cached[th] || new FRESHTheme().open( themePath );
formatsHash[ key ] = cached[ th ].getFormat( key );
});
}
// Check for an explicit "formats" entry in the theme JSON. If it has one,
// then this theme declares its files explicitly.
if( !!this.formats ) {
formatsHash = loadExplicit.call( this );
formatsHash = loadExplicit.call( this, formatsHash );
this.explicit = true;
}
else {
formatsHash = loadImplicit.call( this );
formatsHash = loadImplicit.call( this, formatsHash );
}
// Cache
@ -95,10 +107,9 @@ Definition of the FRESHTheme class.
Load the theme implicitly, by scanning the theme folder for
files. TODO: Refactor duplicated code with loadExplicit.
*/
function loadImplicit() {
function loadImplicit(formatsHash) {
// Set up a hash of formats supported by this theme.
var formatsHash = { };
var that = this;
var major = false;
@ -195,10 +206,9 @@ Definition of the FRESHTheme class.
Load the theme explicitly, by following the 'formats' hash
in the theme's JSON settings file.
*/
function loadExplicit() {
function loadExplicit(formatsHash) {
// Housekeeping
var formatsHash = { };
var tplFolder = PATH.join( this.folder, 'src' );
var act = null;
var that = this;