v1.0.6

use $.extend
v1.0.5
2025-08-03 21:10:04 +02:00 · 2019-04-18 16:22:44 +02:00 · 2019-04-18 16:06:07 +02:00 · 2019-04-18 15:47:37 +02:00 · 2019-04-18 15:47:25 +02:00 · 2019-04-18 12:40:03 +02:00
7 changed files with 18 additions and 41 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -28,7 +28,6 @@
 		"dot-notation": 0,
 		"no-multi-str": 2,
 		"key-spacing": [2, {"afterColon": true}],
-		"func-call-spacing": [2, "never"],
-		"no-console": "warn"
+		"func-call-spacing": [2, "never"]
 	}
 }
--- a/ejs-render-remote.js
+++ b/ejs-render-remote.js
@@ -37,18 +37,14 @@
 			}

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

-				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)) {
@@ -65,19 +61,15 @@

 		//if the template is already cached, just return.
 		if (ejs.cache.get(templateUrl)) {
-			d.resolve(templateUrl);
+			d.resolve();
 		} else {
 			$.get(templateUrl)
-			.done(function(template) {
-				try {
+			.then(function(template) {
 				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,7 +9,6 @@
 <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>
@@ -19,14 +18,6 @@
 	<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/somestuff.ejs
+++ b/examples/templates/somestuff.ejs
@@ -1 +0,0 @@
-<p class="stuff"></p>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ejs-render-remote",
-  "version": "1.0.13",
+  "version": "1.0.6",
  "description": "",
  "main": "index.js",
  "homepage": "https://github.com/S2-/ejs-render-remote",
@@ -9,9 +9,5 @@
  },
  "author": "s2 <s2@31337.it>",
  "license": "ISC",
-  "keywords": [
-    "ejs",
-    "templating",
-    "client-side"
-  ]
+  "keywords": ["ejs", "templating", "client-side"]
 }
Author	SHA1	Message	Date
SSantoro	936d5c1d94	v1.0.6	2019-04-18 16:22:44 +02:00
SSantoro	ef5fc54946	use $.extend	2019-04-18 16:06:07 +02:00
SSantoro	df262d40f4	v1.0.5	2019-04-18 15:47:37 +02:00
SSantoro	cd74e87dd3	allow options to be passed in	2019-04-18 15:47:25 +02:00
SSantoro	672b80f5a3	v1.0.4	2019-04-18 12:40:03 +02:00
SSantoro	2cde5f1226	clean up cache right after render	2019-04-18 12:39:51 +02:00
s2	37a2512f4b	v1.0.3	2019-04-14 22:05:08 +02:00