diff options
Diffstat (limited to 'www/js/app.js')
| -rwxr-xr-x | www/js/app.js | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/www/js/app.js b/www/js/app.js index 0cd1ddb7..487a0d0e 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -765,7 +765,7 @@ angular.module('zmApp', [ $http.get(zm.blogUrl, { transformResponse: function (d, h) { var trunc = "])}while(1);</x>"; - d = d.substr(trunc.length); + if (d) {d = d.substr(trunc.length);} return d; } }) @@ -1411,7 +1411,7 @@ angular.module('zmApp', [ //console.log("HERE"); - if ($rootScope.apiValid == false && toState.name != 'invalidapi' && toState.data.requireLogin == true) { + if ($rootScope.apiValid == false && toState.name != 'app.invalidapi' && toState.data.requireLogin == true) { event.preventDefault(); $state.transitionTo('app.invalidapi'); return; @@ -1740,10 +1740,10 @@ angular.module('zmApp', [ localforage.getItem('last-desktop-state') .then(function (succ) { - // console.log ("FOUND " + JSON.stringify(succ) + ":"+succ); + //console.log ("FOUND STATE" + JSON.stringify(succ) + ":"+succ); if (succ) { - if ( succ == 'app.invalidapi' || succ == 'app.refresh') { - succ = 'app.montage'; + if ( succ.name == 'app.invalidapi' || succ.name == 'app.refresh') { + succ.name = 'app.montage'; } $rootScope.lastState = succ.name; if ($rootScope.lastState.indexOf("app.") == -1) { @@ -1751,6 +1751,9 @@ angular.module('zmApp', [ } $rootScope.lastStateParam = succ.params; + + NVRDataModel.debug ("last state="+$rootScope.lastState+" param="+$rootScope.lastStateParam); + } loadServices(); }, function (err) { |