Replace 'for in' with 'Object.keys'

neumino · Jul 6, 2014 · 79d5b6d · 79d5b6d
1 parent 6cd4ca1
commit 79d5b6d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/lib/helper.js b/lib/helper.js
@@ -37,8 +37,9 @@ function hasImplicit(arg) {
 module.exports.hasImplicit = hasImplicit;
 
 function loopKeys(obj, fn) {
-    for(var key in obj) {
-        fn(obj, key);
+    var keys = Object.keys(obj);
+    for(var i=0; i<keys.length; i++) {
+        fn(obj, keys[i]);
     }
 }
 module.exports.loopKeys = loopKeys;

diff --git a/lib/term.js b/lib/term.js
@@ -1635,10 +1635,8 @@ Term.prototype.expr = function(expression, nestingLevel) {
 
         var optArgs = {};
         helper.loopKeys(expression, function(expression, key) {
-            if (expression.hasOwnProperty(key)) {
-                if (expression[key] !== undefined) {
-                    optArgs[key] = new Term(self._r).expr(expression[key], nestingLevel-1)._query;
-                }
+            if (expression[key] !== undefined) {
+                optArgs[key] = new Term(self._r).expr(expression[key], nestingLevel-1)._query;
             }
         });
         return new Term(self._r, optArgs);
@@ -1772,10 +1770,8 @@ Term.prototype._translateArgs = {
 function translateOptions(options) {
     var translatedOpt = {};
     helper.loopKeys(options, function(options, key) {
-        if (options.hasOwnProperty(key) && (options[key] !== undefined)) {
-            var keyServer = Term.prototype._translateArgs[key] || key;
-            translatedOpt[keyServer] = options[key];
-        }
+        var keyServer = Term.prototype._translateArgs[key] || key;
+        translatedOpt[keyServer] = options[key];
     });
     return translatedOpt;
 }