mirror of
https://github.com/JuanCanham/HackMyResume.git
synced 2024-11-05 09:56:22 +00:00
Merge branch 'master' into dev
This commit is contained in:
commit
12a14dadeb
8
dist/core/fresh-theme.js
vendored
8
dist/core/fresh-theme.js
vendored
@ -95,7 +95,7 @@ Definition of the FRESHTheme class.
|
|||||||
/* Load and parse theme source files. */
|
/* Load and parse theme source files. */
|
||||||
|
|
||||||
_load = function(formatsHash) {
|
_load = function(formatsHash) {
|
||||||
var copyOnly, fmts, major, that, tplFolder;
|
var copyOnly, fmts, jsFiles, major, that, tplFolder;
|
||||||
that = this;
|
that = this;
|
||||||
major = false;
|
major = false;
|
||||||
tplFolder = PATH.join(this.folder, 'src');
|
tplFolder = PATH.join(this.folder, 'src');
|
||||||
@ -124,6 +124,12 @@ Definition of the FRESHTheme class.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
jsFiles = fmts.filter(function(fmt) {
|
||||||
|
return fmt && (fmt.ext === 'js');
|
||||||
|
});
|
||||||
|
this.jsFiles = jsFiles.map(function(jsf) {
|
||||||
|
return jsf['path'];
|
||||||
|
});
|
||||||
return formatsHash;
|
return formatsHash;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
7
dist/helpers/handlebars-helpers.js
vendored
7
dist/helpers/handlebars-helpers.js
vendored
@ -23,7 +23,7 @@ Template helper definitions for Handlebars.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
module.exports = function(theme, opts) {
|
module.exports = function(theme, opts) {
|
||||||
var wrappedHelpers;
|
var i, len, ref, themeHelpers, wrappedHelpers;
|
||||||
helpers.theme = theme;
|
helpers.theme = theme;
|
||||||
helpers.opts = opts;
|
helpers.opts = opts;
|
||||||
helpers.type = 'handlebars';
|
helpers.type = 'handlebars';
|
||||||
@ -41,6 +41,11 @@ Template helper definitions for Handlebars.
|
|||||||
}, this);
|
}, this);
|
||||||
HANDLEBARS.registerHelper(wrappedHelpers);
|
HANDLEBARS.registerHelper(wrappedHelpers);
|
||||||
HANDLEBARS.registerHelper(blockHelpers);
|
HANDLEBARS.registerHelper(blockHelpers);
|
||||||
|
ref = theme.jsFiles;
|
||||||
|
for (i = 0, len = ref.length; i < len; i++) {
|
||||||
|
themeHelpers = ref[i];
|
||||||
|
HANDLEBARS.registerHelper(require(themeHelpers));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
@ -115,8 +115,12 @@ _load = (formatsHash) ->
|
|||||||
# Found a CSS file without an HTML file in a theme that inherits
|
# Found a CSS file without an HTML file in a theme that inherits
|
||||||
# from another theme. This is the override CSS file.
|
# from another theme. This is the override CSS file.
|
||||||
that.overrides = { file: cssf.path, data: cssf.data }
|
that.overrides = { file: cssf.path, data: cssf.data }
|
||||||
formatsHash
|
|
||||||
|
|
||||||
|
# Now, save all the javascript file paths to a theme property.
|
||||||
|
jsFiles = fmts.filter (fmt) -> fmt and (fmt.ext == 'js')
|
||||||
|
@.jsFiles = jsFiles.map (jsf) -> jsf['path']
|
||||||
|
|
||||||
|
formatsHash
|
||||||
|
|
||||||
|
|
||||||
### Load a single theme file. ###
|
### Load a single theme file. ###
|
||||||
|
@ -33,4 +33,6 @@ module.exports = ( theme, opts ) ->
|
|||||||
|
|
||||||
HANDLEBARS.registerHelper wrappedHelpers
|
HANDLEBARS.registerHelper wrappedHelpers
|
||||||
HANDLEBARS.registerHelper blockHelpers
|
HANDLEBARS.registerHelper blockHelpers
|
||||||
|
for themeHelpers in theme.jsFiles
|
||||||
|
HANDLEBARS.registerHelper require themeHelpers
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user