fix isTrue handlebars helper

abecms · Sep 12, 2016 · d951056 · d951056
1 parent 58646b3
commit d951056
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/cli/handlebars/utils/isTrue.js b/src/cli/handlebars/utils/isTrue.js
@@ -16,15 +16,15 @@ export default function isTrue(v1, operator, v2) {
     case '&&':
       var eval1 = false;
       var eval2 = false;
-      if((v1 && !Array.isArray(v1)) || (Array.isArray(v1) && v1.length>0)) eval1 = true;
-      if((v2 && !Array.isArray(v2)) || (Array.isArray(v2) && v1.length>0)) eval2 = true;
+      if((v1 && !Array.isArray(v1)) || (Array.isArray(v1) && v1.length>0) || typeof v1 === 'object') eval1 = true;
+      if((v2 && !Array.isArray(v2)) || (Array.isArray(v2) && v2.length>0) || typeof v2 === 'object') eval2 = true;
 
       return (eval1 && eval2);
     case '||':
       var eval1 = false;
       var eval2 = false;
-      if((v1 && !Array.isArray(v1)) || (Array.isArray(v1) && v1.length>0)) eval1 = true;
-      if((v2 && !Array.isArray(v2)) || (Array.isArray(v2) && v1.length>0)) eval2 = true;
+      if((v1 && !Array.isArray(v1)) || (Array.isArray(v1) && v1.length>0) || typeof v1 === 'object') eval1 = true;
+      if((v2 && !Array.isArray(v2)) || (Array.isArray(v2) && v1.length>0) || typeof v2 === 'object') eval2 = true;
 
       return (eval1 || eval2);
     default: