1.0.13

just throw when called sync
1.0.12
2025-08-02 20:50:04 +02:00 · 2020-02-12 19:37:44 +01:00 · 2020-02-12 19:37:36 +01:00 · 2020-02-08 22:38:28 +01:00 · 2020-02-08 22:37:54 +01:00 · 2020-02-08 18:24:09 +01:00
7 changed files with 43 additions and 23 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -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"
 	}
 }
--- a/ejs-render-remote.js
+++ b/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) {
@@ -40,14 +37,18 @@
 			}

 			var r = uuidv4();
-			getTemplateFn.then(function(template) {
+			getTemplateFn.done(function(template) {
 				var templateOptions = overwriteWithCacheOptions(options, templateUrl);

-				$('#' + r).replaceWith(ejs.render(
-					template,
-					data,
-					templateOptions
-				));
+				try {
+					$('#' + r).replaceWith(ejs.render(
+						template,
+						data,
+						templateOptions
+					));
+				} catch(ex) {
+					$.readyException(ex);
+				}

 				//clean up the getFnFor
 				if (ejs.cache.remove && ejs.cache.get('getFnFor' + templateUrl)) {
@@ -64,15 +65,19 @@

 		//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);
-				ejs.cache.set(templateUrl, templateFn);
-
-				d.resolve(templateUrl);
+			.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) {
+					$.readyException(ex);
+					d.reject(ex);
+				}
 			});
 		}

--- a/examples/ejs.min.js
+++ b/examples/ejs.min.js
--- a/examples/index.html
+++ b/examples/index.html
@@ -9,6 +9,7 @@
 <body>
 	<h1>ejs-render-remote example</h1>
 	<p class="hello"></p>
+	<div class="sometext"></div>

 	<script src="jquery.min.js"></script>
 	<script src="ejs.min.js"></script>
@@ -18,6 +19,14 @@
 	<script>
 		//render the template
 		$('.hello').html(ejs.rr('templates/hello.ejs', {name: 'Simon'}));
+
+		//a more elaborate example: preload the template to be sure the dom is
+		//ready when manipulated
+		ejs.preloadTemplate('templates/somestuff.ejs')
+		.then(function(t) {
+			$('.sometext').html(ejs.rr(t)); //this is sync now
+			$('.stuff').html('hi!');
+		});
 	</script>
 </body>
 </html>
--- a/examples/templates/hello.ejs
+++ b/examples/templates/hello.ejs
@@ -1 +1 @@
-Hello <%= name%>!
+Hello <%= name %>!
--- a/examples/templates/somestuff.ejs
+++ b/examples/templates/somestuff.ejs
@@ -0,0 +1 @@
+<p class="stuff"></p>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ejs-render-remote",
-  "version": "1.0.5",
+  "version": "1.0.13",
  "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"
+  ]
 }
Author	SHA1	Message	Date
s2	2701eb3060	1.0.13	2020-02-12 19:37:44 +01:00
s2	ad9d3b9be9	just throw when called sync	2020-02-12 19:37:36 +01:00
s2	21d9319f97	1.0.12	2020-02-08 22:38:28 +01:00
s2	371d16bc2e	s/then/done/	2020-02-08 22:37:54 +01:00
s2	d53c239f90	no-console	2020-02-08 18:24:09 +01:00
s2	6635965706	1.0.11	2020-02-08 18:22:48 +01:00
s2	dfcf1a4b6f	use $.readyException	2020-02-08 18:22:16 +01:00
s2	4b3df71c6b	1.0.10	2020-02-08 17:57:16 +01:00
s2	af63b77c9b	add more logs	2020-02-08 17:57:05 +01:00
s2	9aba0176f4	add an example	2020-02-08 17:05:22 +01:00
s2	75401b90dd	update ejs	2020-02-08 16:58:53 +01:00
s2	47459bd322	1.0.9	2020-02-07 20:50:08 +01:00
s2	6ed2b48d36	log async ejs compile error to console	2020-02-07 20:50:01 +01:00
s2	23d46035e8	1.0.8	2020-02-07 17:29:59 +01:00
s2	1c720ce9f3	when compile throws an exception, log it to the console	2020-02-07 17:26:54 +01:00
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