#709 implement native/XHR wrapper, convert all success/error to "then" construct

1 files changed, 8 insertions, 6 deletions

diff --git a/www/js/MenuController.js b/www/js/MenuController.js
index 995abba3..8de4aeb3 100644
--- a/www/js/MenuController.js
+++ b/www/js/MenuController.js
@@ -119,8 +119,9 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
         NVRDataModel.log("Validating APIs at " + apiurl);
         $http.get(apiurl)
-          .success(function (data) {
+          .then(function (data) {
 
+            data = data.data;
             NVRDataModel.getTimeZone(true);
             var loginStatus = $translate.instant('kExploreEnjoy') + " " + $rootScope.appName + "!";
             EventServer.refresh();
@@ -135,7 +136,8 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
                 NVRDataModel.log("ZM relative cgi-path: " + zm_cgi + ", you entered: " + user_cgi);
 
                 $http.get(ld.streamingurl + "/zms")
-                  .success(function (data) {
+                  .then(function (data) {
+                    data = data.data;
                     NVRDataModel.debug("Urk! cgi-path returned  success, but it should not have come here");
                     loginStatus = $translate.instant('kLoginStatusNoCgi');
 
@@ -183,8 +185,8 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
                         });
 
-                  })
-                  .error(function (error, status) {
+                  },
+                function (error, status) {
                     // If its 5xx, then the cgi-bin path is valid
                     // if its 4xx then the cgi-bin path is not valid
 
@@ -233,8 +235,8 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
                   });
               });
 
-          })
-          .error(function (error) {
+          },
+          function (error) {
             NVRDataModel.displayBanner('error', [$translate.instant('kBannerAPICheckFailed'), $translate.instant('kBannerPleaseCheck')]);
             NVRDataModel.log("API login error " + JSON.stringify(error));