archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Added code to still allow old compiled templates to load correctly

Browse Source
This commit is contained in:
Patrick Steele-Idem 2015-02-16 07:38:28 -07:00
parent 0c83f0d312
commit 94ad082fbd
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
runtime/marko-runtime.js
View File

@ -188,6 +188,26 @@ if (stream) {
require('raptor-util/inherit')(Readable, stream.Readable);
}
/**
* NOTE: This method can be removed in the very near future.
* It is only needed to make sure old templates that compiled
* to `module.exports = function(helpers) { ... }` will still
* load correctly even though new templates are compiled to
* `exports.create = function(helpers) { ... }`
*
*/
function wrapLegacyCompiledTemplate(loadedTemplate) {
if (typeof loadedTemplate === 'function') {
return {
create: function(helpers) {
return loadedTemplate(helpers);
}
};
}
return loadedTemplate;
}
function load(templatePath, options) {
var cache = exports.cache;
@ -206,14 +226,14 @@ function load(templatePath, options) {
// as the first argument to the factory function to produce
// the compiled template function
template = cache[templatePath] = new Template(
loader(templatePath).create(helpers), // Load the template factory and invoke it
wrapLegacyCompiledTemplate(loader(templatePath)).create(helpers), // Load the template factory and invoke it
options);
}
} else {
// Instead of a path, assume we got a compiled template module
// We store the loaded template with the factory function that was
// used to get access to the compiled template function
template = templatePath._ || (templatePath._ = new Template(templatePath.create(helpers), options));
template = templatePath._ || (templatePath._ = new Template(wrapLegacyCompiledTemplate(templatePath).create(helpers), options));
}
return template;