Merge pull request #341 from Jiri-Kremser/overriding-eval

Fixing the gulp build (Invalid use of 'eval')
hawkular · Jul 20, 2015 · 8bd1364 · 8bd1364
2 parents dd08c3c + 43914e8
commit 8bd1364
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/ts/alertsManager.ts b/console/src/main/scripts/plugins/metrics/ts/alertsManager.ts
@@ -290,18 +290,18 @@ module HawkularMetrics {
           var count: number = 0.0;
 
           for (var j = 0; j < serverAlert.evalSets.length; j++) {
-            var eval = serverAlert.evalSets[j][0];
+            var evalItem = serverAlert.evalSets[j][0];
 
-            if (!consoleAlert.start && eval.dataTimestamp) {
-              consoleAlert.start = eval.dataTimestamp;
+            if (!consoleAlert.start && evalItem.dataTimestamp) {
+              consoleAlert.start = evalItem.dataTimestamp;
             }
 
-            if (!consoleAlert.threshold && eval.condition.threshold) {
-              consoleAlert.threshold = eval.condition.threshold;
+            if (!consoleAlert.threshold && evalItem.condition.threshold) {
+              consoleAlert.threshold = evalItem.condition.threshold;
             }
 
-            if (!consoleAlert.type && eval.condition.type) {
-              consoleAlert.type = eval.condition.type;
+            if (!consoleAlert.type && evalItem.condition.type) {
+              consoleAlert.type = evalItem.condition.type;
             }
 
             var momentAlert = this.$moment(consoleAlert.end);
@@ -313,7 +313,7 @@ module HawkularMetrics {
               }
             }
 
-            sum += eval.value;
+            sum += evalItem.value;
             count++;
           }