Made various tweaks to config files and code to make things work on Android. Using crosswalk for Android for better performance

1 files changed, 10 insertions, 9 deletions

diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index def65266..4e217464 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -16,25 +16,26 @@ $scope.reloadView = function ()
     $ionicLoading.show({
                 template: "refreshed view",
                 noBackdrop: true,
-                duration: 3000
+                duration: 2000
             });
 }
 
-$scope.initLoadingImage = function()
+$scope.isSimulated = function () {
+        return ZMDataModel.isSimulated();
+    };
+
+
+$scope.finishedLoadingImage = function()
     {
-        console.log ("***Loading***");
+        console.log ("***Monitor image FINISHED Loading***");
+        $ionicLoading.hide();
        /* $ionicLoading.show({
             template: "loading, please wait...",
             noBackdrop: true,
         });*/
     }
 
-
-    $scope.finishedLoadingImage = function()
-    {
-         $ionicLoading.hide();
-       // alert ("IMAGE LOADED");
-    }
+   
 
  $scope.$on('$ionicView.loaded', function(){
     console.log("**VIEW ** Monitor Ctrl Loaded");