v1.0.7

ejs-render-remote.js

@@ -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,35 +38,35 @@
 
 			var r = uuidv4();
 			getTemplateFn.then(function(template) {
+				var templateOptions = overwriteWithCacheOptions(options, templateUrl);
+
 				$('#' + r).replaceWith(ejs.render(
 					template,
 					data,
-					{
+					templateOptions
-						cache: true,
-						filename: templateUrl
-					}
 				));
+
+				//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.
 		if (ejs.cache.get(templateUrl)) {
-			d.resolve();
+			d.resolve(templateUrl);
 		} else {
 			$.get(templateUrl)
 			.then(function(template) {
-				var templateFn = ejs.compile(template,
+				var templateOptions = overwriteWithCacheOptions(options, templateUrl);
-					{
+				var templateFn = ejs.compile(template, templateOptions);
-						cache: true,
-						filename: templateUrl
-					});
-
 				ejs.cache.set(templateUrl, templateFn);
 
 				d.resolve(templateUrl);

package.json

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