Bugfix, escaping in template was completely mad

vanng822 · May 31, 2014 · f763f23 · f763f23
1 parent abaeb0f
commit f763f23
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/lib/template.js b/lib/template.js
@@ -49,11 +49,15 @@ exports.module = function(pagination, util) {
 		return buf.join('');
 	};
 	var _escape = function(text) {
-		return String(text).replace(/&(?!\w+;)/g, '&amp;').replace(/</g, '&lt;')
-				.replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+		return String(text)
+				.replace(/&/g, '&amp;')
+				.replace(/</g, '&lt;')
+				.replace(/>/g, '&gt;')
+				.replace(/"/g, '&quot;')
+				.replace(/'/g, '&#39;');
 	};
 	var _compile = function(str, options) {
-		var fn = new Function('paginationData', parse(str, options));
+		var fn = new Function('paginationData, escape', parse(str, options));
 		return function(paginationData){
 			return fn.call(this, paginationData, _escape);
 		};

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
 		"type": "git",
 		"url": "git://github.com/vanng822/pagination.git"
 	},
-	"version": "0.4.1",
+	"version": "0.4.2",
 	"scripts": {
 		"test": "vows --spec tests/*"
 	},

diff --git a/release/pagination.et.min.js b/release/pagination.et.min.js