From d9510567022d485e3049082225c67a0a0f1db660 Mon Sep 17 00:00:00 2001 From: gregorybesson Date: Mon, 12 Sep 2016 16:44:31 +0200 Subject: [PATCH] fix isTrue handlebars helper --- src/cli/handlebars/utils/isTrue.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cli/handlebars/utils/isTrue.js b/src/cli/handlebars/utils/isTrue.js index 3e30e5e9..1359dcca 100755 --- 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: