Fixed some errors introduced while refactoring

adazzle · Jan 21, 2016 · e8b3697 · e8b3697
1 parent 5da97f5
commit e8b3697
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/DOMMetrics.js b/src/DOMMetrics.js
@@ -53,9 +53,11 @@ let MetricsComputatorMixin = {
         }
       }
 
-      metricsToDelete.forEach((metricName) => {
-        delete s.metrics[metricName];
-      });
+      for (name in metricsToDelete) {
+        if (metricsToDelete.hasOwnProperty(name)) {
+          delete s.metrics[name];
+        }
+      }
     }
   },
 
@@ -65,7 +67,7 @@ let MetricsComputatorMixin = {
     let needUpdate = false;
 
     for (let name in s.metrics) {
-      if (name == null) continue;
+      if (!s.metrics.hasOwnProperty(name)) continue;
 
       let newMetric = s.metrics[name].computator();
       if (newMetric !== s.metrics[name].value) {
@@ -114,7 +116,7 @@ let MetricsMixin = {
 
       this.DOMMetrics = {};
       for (let name in this._DOMMetricsDefs) {
-        if (name == null) continue;
+        if (!this._DOMMetricsDefs.hasOwnProperty(name)) continue;
 
         this.DOMMetrics[name] = emptyFunction;
       }

diff --git a/src/addons/__tests__/GridRunner.js b/src/addons/__tests__/GridRunner.js
@@ -102,9 +102,9 @@ export default class GridRunner {
     const rows = TestUtils.scryRenderedDOMComponentsWithClass(this.grid, 'react-grid-Row');
     let over = [];
     over.push(this.row);
-    let formIterator = form;
+    let fromIterator = from;
 
-    for (let i = formIterator++; i < to; i++) {
+    for (let i = fromIterator++; i < to; i++) {
       over.push(this.getCells(rows[i])[col]);
     }
     const toCell = this.getCells(rows[to])[col];