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 getRequirePath to TemplateBuilder

Browse Source
This commit is contained in:
Patrick Steele-Idem 2014-07-22 23:52:40 -06:00
parent a132433951
commit 19fe5bc2a9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/TemplateBuilder.js
View File

@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
'use strict'; 'use strict';
var raptorModulesResolver = require('raptor-modules/resolver');
var createError = require('raptor-util').createError; var createError = require('raptor-util').createError;
var nodePath = require('path'); var nodePath = require('path');
var stringify = require('raptor-json/stringify'); var stringify = require('raptor-json/stringify');
@ -502,6 +503,9 @@ TemplateBuilder.prototype = {
transformTree: function (node) { transformTree: function (node) {
this.compiler.transformTree(node, this); this.compiler.transformTree(node, this);
}, },
getRequirePath: function(targetModuleFile) {
return raptorModulesResolver.deresolve(targetModuleFile, this.dirname);
},
INDENT: INDENT INDENT: INDENT
}; };
module.exports = TemplateBuilder; module.exports = TemplateBuilder;

3
taglibs/core/TagHandlerNode.js
View File

@ -17,7 +17,6 @@
var extend = require('raptor-util').extend; var extend = require('raptor-util').extend;
var forEachEntry = require('raptor-util').forEachEntry; var forEachEntry = require('raptor-util').forEachEntry;
var stringify = require('raptor-json/stringify'); var stringify = require('raptor-json/stringify');
var raptorModulesResolver = require('raptor-modules/resolver');
function addHandlerVar(template, renderer) { function addHandlerVar(template, renderer) {
var handlerVars = template._handlerVars || (template._handlerVars = {}); var handlerVars = template._handlerVars || (template._handlerVars = {});
@ -86,7 +85,7 @@ TagHandlerNode.prototype = {
this.inputExpression = expression; this.inputExpression = expression;
}, },
doGenerateCode: function (template) { doGenerateCode: function (template) {
var rendererPath = raptorModulesResolver.deresolve(this.tag.renderer, template.dirname); var rendererPath = template.getRequirePath(this.tag.renderer); // Resolve a path to the renderer relative to the directory of the template
var handlerVar = addHandlerVar(template, rendererPath); var handlerVar = addHandlerVar(template, rendererPath);
var tagHelperVar = template.addStaticVar('_tag', '__helpers.t'); var tagHelperVar = template.addStaticVar('_tag', '__helpers.t');