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

Allow taglibs to be imported from other taglibs

Browse Source
This commit is contained in:
Phillip Gates-Idem 2015-05-14 15:44:00 -04:00
parent 85737558d6
commit 73e9a3420a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/taglibs/taglib-loader/loader-taglib.js
View File

@ -146,6 +146,8 @@ TaglibHandlers.prototype = {
// section
var taglib = this.taglib;
var dirname = this.dirname;
var importPath;
var resolveFrom = require('resolve-from');
if (imports && Array.isArray(imports)) {
for (var i=0; i<imports.length; i++) {
@ -160,10 +162,9 @@ TaglibHandlers.prototype = {
var dependencyNames = Object.keys(dependencies);
for (var j=0; j<dependencyNames.length; j++) {
var dependencyName = dependencyNames[j];
var importPath;
try {
importPath = require('resolve-from')(dirname, dependencyName + '/marko-taglib.json');
importPath = resolveFrom(dirname, dependencyName + '/marko-taglib.json');
} catch(e) {}
if (importPath) {
@ -171,6 +172,9 @@ TaglibHandlers.prototype = {
}
}
}
} else {
importPath = resolveFrom(dirname, curImport);
taglib.addImport(importPath);
}
}
}