From 97043de7e408d4cd312ed2c201a91ceed1f3a13c Mon Sep 17 00:00:00 2001 From: Slava Kim Date: Tue, 26 Nov 2013 16:19:09 -0800 Subject: [PATCH] Move LOGICAL_OPERATORS back to file scope --- packages/minimongo/selector.js | 2 +- packages/minimongo/selector_modifier.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js index d6410ad2fb..e077b9363c 100644 --- a/packages/minimongo/selector.js +++ b/packages/minimongo/selector.js @@ -95,7 +95,7 @@ var compileValueSelector = function (valueSelector, selector, cursor) { }; // XXX can factor out common logic below -LOGICAL_OPERATORS = { +var LOGICAL_OPERATORS = { "$and": function(subSelector, operators, cursor) { if (!isArray(subSelector) || _.isEmpty(subSelector)) throw Error("$and/$or/$nor must be nonempty array"); diff --git a/packages/minimongo/selector_modifier.js b/packages/minimongo/selector_modifier.js index c8d49d65ba..6e6a65f3b8 100644 --- a/packages/minimongo/selector_modifier.js +++ b/packages/minimongo/selector_modifier.js @@ -107,7 +107,7 @@ var getPaths = MinimongoTest.getSelectorPaths = function (sel) { if (k === "$where") return ''; // matches everything // we branch from $or/$and/$nor operator - if (_.has(LOGICAL_OPERATORS, k)) + if (_.contains(['$or', '$and', '$nor'], k)) return _.map(v, getPaths); // the value is a literal or some comparison operator return k;