mirror of
https://github.com/S2-/ejs-render-remote
synced 2025-08-02 20:50:04 +02:00
Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
21d9319f97 | |||
371d16bc2e | |||
d53c239f90 | |||
6635965706 | |||
dfcf1a4b6f |
@@ -28,6 +28,7 @@
|
||||
"dot-notation": 0,
|
||||
"no-multi-str": 2,
|
||||
"key-spacing": [2, {"afterColon": true}],
|
||||
"func-call-spacing": [2, "never"]
|
||||
"func-call-spacing": [2, "never"],
|
||||
"no-console": "warn"
|
||||
}
|
||||
}
|
||||
|
@@ -28,8 +28,7 @@
|
||||
try {
|
||||
return templateFn(data);
|
||||
} catch(ex) {
|
||||
console.error(ex);
|
||||
throw ex;
|
||||
$.readyException(ex);
|
||||
}
|
||||
|
||||
} else { //if the template is not cached, we need to get it and render it later once we have it. remember: this happens only if the template is not already cached
|
||||
@@ -42,7 +41,7 @@
|
||||
}
|
||||
|
||||
var r = uuidv4();
|
||||
getTemplateFn.then(function(template) {
|
||||
getTemplateFn.done(function(template) {
|
||||
var templateOptions = overwriteWithCacheOptions(options, templateUrl);
|
||||
|
||||
try {
|
||||
@@ -52,7 +51,7 @@
|
||||
templateOptions
|
||||
));
|
||||
} catch(ex) {
|
||||
console.error(templateUrl, ex);
|
||||
$.readyException(ex);
|
||||
}
|
||||
|
||||
//clean up the getFnFor
|
||||
@@ -73,16 +72,15 @@
|
||||
d.resolve(templateUrl);
|
||||
} else {
|
||||
$.get(templateUrl)
|
||||
.then(function(template) {
|
||||
.done(function(template) {
|
||||
try {
|
||||
var templateOptions = overwriteWithCacheOptions(options, templateUrl);
|
||||
var templateFn = ejs.compile(template, templateOptions);
|
||||
ejs.cache.set(templateUrl, templateFn);
|
||||
d.resolve(templateUrl);
|
||||
} catch(ex) {
|
||||
console.error(templateUrl, ex);
|
||||
$.readyException(ex);
|
||||
d.reject(ex);
|
||||
throw ex;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ejs-render-remote",
|
||||
"version": "1.0.10",
|
||||
"version": "1.0.12",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"homepage": "https://github.com/S2-/ejs-render-remote",
|
||||
|
Reference in New Issue
Block a user