1
0
mirror of https://github.com/S2-/ejs-render-remote synced 2025-08-03 13:00:04 +02:00

4 Commits

Author SHA1 Message Date
s2
8c9f23ce3f v1.0.7 2019-05-18 15:30:59 +02:00
s2
94d5afe1a0 resolve with templateUrl even when we have it already in cache 2019-05-18 15:30:59 +02:00
s2
f5a44438d1 v1.0.6 2019-05-18 15:30:59 +02:00
s2
06b2289724 use $.extend 2019-05-18 15:30:59 +02:00
2 changed files with 4 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
//this uses jQuery for now because ie11 support is needed (promises and fetch) //this uses jQuery for now because ie11 support is needed (promises, fetch, Object.assign)
(function($) { (function($) {
var uuidv4 = function() { var uuidv4 = function() {
@@ -16,11 +16,8 @@
}; };
var templateOptions = options || {}; var templateOptions = options || {};
for (var attrname in cacheOptions) {
templateOptions[attrname] = cacheOptions[attrname];
}
return templateOptions; return $.extend(templateOptions, cacheOptions);
}; };
ejs.rr = function(templateUrl, data, options) { ejs.rr = function(templateUrl, data, options) {
@@ -64,7 +61,7 @@
//if the template is already cached, just return. //if the template is already cached, just return.
if (ejs.cache.get(templateUrl)) { if (ejs.cache.get(templateUrl)) {
d.resolve(); d.resolve(templateUrl);
} else { } else {
$.get(templateUrl) $.get(templateUrl)
.then(function(template) { .then(function(template) {

View File

@@ -1,6 +1,6 @@
{ {
"name": "ejs-render-remote", "name": "ejs-render-remote",
"version": "1.0.5", "version": "1.0.7",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"homepage": "https://github.com/S2-/ejs-render-remote", "homepage": "https://github.com/S2-/ejs-render-remote",