Fix for change in handlebars 2.0

Handlebars 2.0 now renders boolean false as the word "false" instead of an empty string. This broke all tests that returned a false value. Helpers have now been updated to explicitly return an empty string, so as to maintain compatibility with both Handlebars 1.3 and 2.0. See handlebars-lang/handlebars.js#827
Twipped · Sep 12, 2014 · f704a06 · f704a06
1 parent cf84fbd
commit f704a06
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 34 deletions.
diff --git a/build/hoard.all.js b/build/hoard.all.js
@@ -278,7 +278,7 @@ exports.all = function () {
 			yes = !!input;
 		}
 
-		if (!options.fn) return yes;
+		if (!options.fn) return yes || '';
 
 		return yes ? options.fn(this) : options.inverse(this);
 	};
@@ -314,7 +314,7 @@ exports.any = function () {
 			yes = !!input;
 		}
 
-		if (!options.fn) return yes;
+		if (!options.fn) return yes || '';
 
 		return yes ? options.fn(this) : options.inverse(this);
 	};
@@ -376,7 +376,7 @@ exports.empty = function () {
 		}
 
 		if (!options.fn) {
-			return yes;
+			return yes || '';
 		} else {
 			return yes ? options.fn(this) : options.inverse(this);
 		}
@@ -490,7 +490,7 @@ exports.inArray = function () {
 	return function (input, value, options) {
 		var result = input.indexOf(value) >= 0;
 
-		if (!options.fn) return result;
+		if (!options.fn) return result || '';
 
 		return result ? options.fn(this) : options.inverse(this);
 	};
@@ -646,7 +646,7 @@ exports.notEmpty = function () {
 		}
 
 		if (!options.fn) {
-			return yes;
+			return yes || '';
 		} else {
 			return yes ? options.fn(this) : options.inverse(this);
 		}
@@ -853,15 +853,15 @@ exports.compare = function () {
 
 		var result = !!operators[operator](left, right);
 
-		if (!options.fn) return result;
+		if (!options.fn) return result || '';
 
 		return result ? options.fn(this) : options.inverse(this);
 	};
 };
 
 exports.gt = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value > test;
+		if (!options.fn) return value > test || '';
 		if (value > test) {
 			return options.fn(this);
 		} else {
@@ -872,7 +872,7 @@ exports.gt = function () {
 
 exports.gte = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value >= test;
+		if (!options.fn) return value >= test || '';
 		if (value >= test) {
 			return options.fn(this);
 		} else {
@@ -892,14 +892,14 @@ exports.gte = function () {
 exports.has = function () {
 	return function (input, value, options) {
 		var result = input.indexOf(value) >= 0;
-		if (!options.fn) return result;
+		if (!options.fn) return result || '';
 		return result ? options.fn(this) : options.inverse(this);
 	};
 };
 
 exports.is = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value === test;
+		if (!options.fn) return value === test || '';
 		if (value === test) {
 			return options.fn(this);
 		} else {
@@ -910,7 +910,7 @@ exports.is = function () {
 
 exports.isLike = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value == test;
+		if (!options.fn) return value == test || '';
 		if (value == test) {
 			return options.fn(this);
 		} else {
@@ -921,7 +921,7 @@ exports.isLike = function () {
 
 exports.isnt = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value !== test;
+		if (!options.fn) return value !== test || '';
 		if (value !== test) {
 			return options.fn(this);
 		} else {
@@ -932,7 +932,7 @@ exports.isnt = function () {
 
 exports.isntLike = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value != test;
+		if (!options.fn) return value != test || '';
 		if (value != test) {
 			return options.fn(this);
 		} else {
@@ -943,7 +943,7 @@ exports.isntLike = function () {
 
 exports.lt = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value < test;
+		if (!options.fn) return value < test || '';
 		if (value < test) {
 			return options.fn(this);
 		} else {
@@ -954,7 +954,7 @@ exports.lt = function () {
 
 exports.lte = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value <= test;
+		if (!options.fn) return value <= test || '';
 		if (value <= test) {
 			return options.fn(this);
 		} else {
@@ -1514,7 +1514,7 @@ exports.endsWith = function () {
 		var result = haystack.substr(-needle.length) === needle;
 
 		if (!options.fn) {
-			return result;
+			return result || '';
 		}
 
 		return result ? options.fn(this) : options.inverse(this);
@@ -2700,7 +2700,7 @@ exports.startsWith = function () {
 		var result = haystack.substr(0,needle.length) === needle;
 
 		if (!options.fn) {
-			return result;
+			return result || '';
 		}
 
 		return result ? options.fn(this) : options.inverse(this);

diff --git a/src/helpers/collection/all.js b/src/helpers/collection/all.js
@@ -29,7 +29,7 @@ exports.all = function () {
 			yes = !!input;
 		}
 
-		if (!options.fn) return yes;
+		if (!options.fn) return yes || '';
 
 		return yes ? options.fn(this) : options.inverse(this);
 	};

diff --git a/src/helpers/collection/any.js b/src/helpers/collection/any.js
@@ -29,7 +29,7 @@ exports.any = function () {
 			yes = !!input;
 		}
 
-		if (!options.fn) return yes;
+		if (!options.fn) return yes || '';
 
 		return yes ? options.fn(this) : options.inverse(this);
 	};

diff --git a/src/helpers/collection/empty.js b/src/helpers/collection/empty.js
@@ -17,7 +17,7 @@ exports.empty = function () {
 		}
 
 		if (!options.fn) {
-			return yes;
+			return yes || '';
 		} else {
 			return yes ? options.fn(this) : options.inverse(this);
 		}

diff --git a/src/helpers/collection/inArray.js b/src/helpers/collection/inArray.js
@@ -11,7 +11,7 @@ exports.inArray = function () {
 	return function (input, value, options) {
 		var result = input.indexOf(value) >= 0;
 
-		if (!options.fn) return result;
+		if (!options.fn) return result || '';
 
 		return result ? options.fn(this) : options.inverse(this);
 	};

diff --git a/src/helpers/collection/notEmpty.js b/src/helpers/collection/notEmpty.js
@@ -17,7 +17,7 @@ exports.notEmpty = function () {
 		}
 
 		if (!options.fn) {
-			return yes;
+			return yes || '';
 		} else {
 			return yes ? options.fn(this) : options.inverse(this);
 		}

diff --git a/src/helpers/compare/compare.js b/src/helpers/compare/compare.js
@@ -31,7 +31,7 @@ exports.compare = function () {
 
 		var result = !!operators[operator](left, right);
 
-		if (!options.fn) return result;
+		if (!options.fn) return result || '';
 
 		return result ? options.fn(this) : options.inverse(this);
 	};

diff --git a/src/helpers/compare/gt.js b/src/helpers/compare/gt.js
@@ -1,7 +1,7 @@
 
 exports.gt = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value > test;
+		if (!options.fn) return value > test || '';
 		if (value > test) {
 			return options.fn(this);
 		} else {

diff --git a/src/helpers/compare/gte.js b/src/helpers/compare/gte.js
@@ -1,7 +1,7 @@
 
 exports.gte = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value >= test;
+		if (!options.fn) return value >= test || '';
 		if (value >= test) {
 			return options.fn(this);
 		} else {

diff --git a/src/helpers/compare/has.js b/src/helpers/compare/has.js
@@ -10,7 +10,7 @@
 exports.has = function () {
 	return function (input, value, options) {
 		var result = input.indexOf(value) >= 0;
-		if (!options.fn) return result;
+		if (!options.fn) return result || '';
 		return result ? options.fn(this) : options.inverse(this);
 	};
 };
diff --git a/src/helpers/compare/is.js b/src/helpers/compare/is.js
@@ -1,7 +1,7 @@
 
 exports.is = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value === test;
+		if (!options.fn) return value === test || '';
 		if (value === test) {
 			return options.fn(this);
 		} else {

diff --git a/src/helpers/compare/isLike.js b/src/helpers/compare/isLike.js
@@ -1,7 +1,7 @@
 
 exports.isLike = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value == test;
+		if (!options.fn) return value == test || '';
 		if (value == test) {
 			return options.fn(this);
 		} else {

diff --git a/src/helpers/compare/isnt.js b/src/helpers/compare/isnt.js
@@ -1,7 +1,7 @@
 
 exports.isnt = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value !== test;
+		if (!options.fn) return value !== test || '';
 		if (value !== test) {
 			return options.fn(this);
 		} else {

diff --git a/src/helpers/compare/isntLike.js b/src/helpers/compare/isntLike.js
@@ -1,7 +1,7 @@
 
 exports.isntLike = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value != test;
+		if (!options.fn) return value != test || '';
 		if (value != test) {
 			return options.fn(this);
 		} else {

diff --git a/src/helpers/compare/lt.js b/src/helpers/compare/lt.js
@@ -1,7 +1,7 @@
 
 exports.lt = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value < test;
+		if (!options.fn) return value < test || '';
 		if (value < test) {
 			return options.fn(this);
 		} else {

diff --git a/src/helpers/compare/lte.js b/src/helpers/compare/lte.js
@@ -1,7 +1,7 @@
 
 exports.lte = function () {
 	return function (value, test, options) {
-		if (!options.fn) return value <= test;
+		if (!options.fn) return value <= test || '';
 		if (value <= test) {
 			return options.fn(this);
 		} else {

diff --git a/src/helpers/str/endsWith.js b/src/helpers/str/endsWith.js
@@ -14,7 +14,7 @@ exports.endsWith = function () {
 		var result = haystack.substr(-needle.length) === needle;
 
 		if (!options.fn) {
-			return result;
+			return result || '';
 		}
 
 		return result ? options.fn(this) : options.inverse(this);

diff --git a/src/helpers/str/startsWith.js b/src/helpers/str/startsWith.js
@@ -14,7 +14,7 @@ exports.startsWith = function () {
 		var result = haystack.substr(0,needle.length) === needle;
 
 		if (!options.fn) {
-			return result;
+			return result || '';
 		}
 
 		return result ? options.fn(this) : options.inverse(this);