Merge "Closes-Bug: #1418476 - The response data was getting updated e…

…ven before the subscription to it to update the infobox was made. Because of this the infoboxes were not getting updated with the correct up and down count. Fixed it by moving this subscription before we subscribe for the data change." into R2.0

webroot/js/dashboard-utils.js

@@ -13,7 +13,7 @@ function infraMonitorClass() {
         $.each(downSelectors,function(idx,elem) {
             if($(elem).text() == "0")
                 $(elem).hide();
-            else
+            else 
                 $(elem).show();
         });
     }
@@ -132,20 +132,21 @@ function infraMonitorClass() {
         var result = nodeDS.getDataSourceObj();
         var dataSource = result['dataSource'];
         var deferredObj = result['deferredObj'];
+      //if cached data is available trigger event to update
+        if(result['lastUpdated'] != null && (result['error'] == null || result['error']['errTxt'] == 'abort')){
+            triggerDatasourceEvents(nodeDS);
+        }
+        infoBoxObj['viewModel'].downCnt.subscribe(function(newValue) {
+            showHideDownNodeCnt();
+        });
         //Update the viewModel
         $(nodeDS).on('change',function() {
             var data = dataSource.getItems();
             obj['viewModel'].data(data);
             self.updateInfoBoxes();
             self.updateAlerts();
         });
-        //if cached data is available trigger event to update
-        if(result['lastUpdated'] != null && (result['error'] == null || result['error']['errTxt'] == 'abort')){
-            triggerDatasourceEvents(nodeDS);
-        }
-        infoBoxObj['viewModel'].downCnt.subscribe(function(newValue) {
-            showHideDownNodeCnt();
-        });
+
     }
 
     function loadLogs() {