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

6 Commits

Author SHA1 Message Date
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
s2
9e36c0e82b v1.0.5 2019-05-18 15:30:59 +02:00
s2
6047c6b084 allow options to be passed in 2019-05-18 15:30:59 +02:00
s2
4dd2bfb8a9 v1.0.4 2019-05-18 15:30:59 +02:00
s2
b6e19487b7 clean up cache right after render 2019-05-18 15:30:59 +02:00
2 changed files with 25 additions and 20 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($) {
var uuidv4 = function() {
@@ -9,17 +9,22 @@
});
};
ejs.rr = function(templateUrl, data) {
var overwriteWithCacheOptions = function(options, cacheName) {
var cacheOptions = {
cache: true,
filename: cacheName
};
var templateOptions = options || {};
return $.extend(templateOptions, cacheOptions);
};
ejs.rr = function(templateUrl, data, options) {
var templateFn = ejs.cache.get(templateUrl);
//if the template is already cached, return it and we are done
if (templateFn) {
//but first check if there is still a getter function for this template in the cache
//if yes, remove it so we clean up a bit
if (ejs.cache.remove && ejs.cache.get('getFnFor' + templateUrl)) {
ejs.cache.remove('getFnFor' + templateUrl);
}
return templateFn(data);
} 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
@@ -33,21 +38,25 @@
var r = uuidv4();
getTemplateFn.then(function(template) {
var templateOptions = overwriteWithCacheOptions(options, templateUrl);
$('#' + r).replaceWith(ejs.render(
template,
data,
{
cache: true,
filename: templateUrl
}
templateOptions
));
//clean up the getFnFor
if (ejs.cache.remove && ejs.cache.get('getFnFor' + templateUrl)) {
ejs.cache.remove('getFnFor' + templateUrl);
}
});
return '<span class="ejs-templateplaceholder" style="display: none;" id="' + r + '"></span>';
}
};
ejs.preloadTemplate = function(templateUrl) {
ejs.preloadTemplate = function(templateUrl, options) {
var d = $.Deferred();
//if the template is already cached, just return.
@@ -56,12 +65,8 @@
} else {
$.get(templateUrl)
.then(function(template) {
var templateFn = ejs.compile(template,
{
cache: true,
filename: templateUrl
});
var templateOptions = overwriteWithCacheOptions(options, templateUrl);
var templateFn = ejs.compile(template, templateOptions);
ejs.cache.set(templateUrl, templateFn);
d.resolve(templateUrl);

View File

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