1.0.9

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() {
@@ -16,11 +16,8 @@
 		};
 
 		var templateOptions = options || {};
-		for (var attrname in cacheOptions) {
-			templateOptions[attrname] = cacheOptions[attrname];
-		}
 
-		return templateOptions;
+		return $.extend(templateOptions, cacheOptions);
 	};
 
 	ejs.rr = function(templateUrl, data, options) {
@@ -43,11 +40,15 @@
 			getTemplateFn.then(function(template) {
 				var templateOptions = overwriteWithCacheOptions(options, templateUrl);
 
-				$('#' + r).replaceWith(ejs.render(
-					template,
-					data,
-					templateOptions
-				));
+				try {
+					$('#' + r).replaceWith(ejs.render(
+						template,
+						data,
+						templateOptions
+					));
+				} catch(ex) {
+					console.error(templateUrl, ex);
+				}
 
 				//clean up the getFnFor
 				if (ejs.cache.remove && ejs.cache.get('getFnFor' + templateUrl)) {
@@ -64,12 +65,18 @@
 
 		//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 templateOptions = overwriteWithCacheOptions(options, templateUrl);
-				var templateFn = ejs.compile(template, templateOptions);
+				try {
+					var templateFn = ejs.compile(template, templateOptions);
+				} catch(ex) {
+					console.error(templateUrl, ex);
+					d.reject(ex);
+					throw ex;
+				}
 				ejs.cache.set(templateUrl, templateFn);
 
 				d.resolve(templateUrl);

examples/templates/hello.ejs

@@ -1 +1 @@
-Hello <%= name%>!
+Hello <%= name %>!

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ejs-render-remote",
-  "version": "1.0.5",
+  "version": "1.0.9",
   "description": "",
   "main": "index.js",
   "homepage": "https://github.com/S2-/ejs-render-remote",
@@ -9,5 +9,9 @@
   },
   "author": "s2 <s2@31337.it>",
   "license": "ISC",
-  "keywords": ["ejs", "templating", "client-side"]
+  "keywords": [
+    "ejs",
+    "templating",
+    "client-side"
+  ]
 }