othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LT-275 Fixing helpers merging issues

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-08-08 10:20:12 -03:00
parent 804488458c
commit f5a64574cc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Packages/ohif-core/client/helpers/logical.js
View File

@ -48,7 +48,9 @@ Template.registerHelper('not', value => {
// Check if all the given values are true // Check if all the given values are true
Template.registerHelper('and', (...values) => { Template.registerHelper('and', (...values) => {
let result = true; let result = true;
_.each(arguments, value => value || (result = false)); _.each(_.initial(values, 1), value => {
return !value && (result = false);
});
return result; return result;
}); });
@ -56,10 +58,6 @@ Template.registerHelper('and', (...values) => {
Template.registerHelper('or', (...values) => { Template.registerHelper('or', (...values) => {
let result = false; let result = false;
_.each(_.initial(values, 1), value => { _.each(_.initial(values, 1), value => {
if (value instanceof Spacebars.kw) {
return;
}
return value && (result = true); return value && (result = true);
}); });
return result; return result;