diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-07-02 21:14:59 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-07-02 21:14:59 -0400 |
| commit | 53d7ff589813e8c2f031ead9ad3a63fbbd957c03 (patch) | |
| tree | 9ca085ea07f2a27ccc189791bac7a2312c1057e1 /www/js/app.js | |
| parent | 2e0442f57259456c87ec59e80873e266e3c83fee (diff) | |
We can now see what is the current run state name and change ZM to a custom run state as well (uses isActive)
Diffstat (limited to 'www/js/app.js')
| -rw-r--r-- | www/js/app.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/www/js/app.js b/www/js/app.js index 6cdfbae8..6e7b72ed 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -44,10 +44,8 @@ angular.module('zmApp', [ .factory('timeoutHttpIntercept', function ($rootScope, $q) { return { 'request': function (config) { - if ( !(config.url.indexOf("stop.json") > -1 || - config.url.indexOf("start.json") > -1 || - config.url.indexOf("getDiskPercent.json") > -1 || - config.url.indexOf("restart.json") > -1 )) + if ( !(config.url.indexOf("/api/states/change/") > -1 || + config.url.indexOf("getDiskPercent.json") > -1 )) { config.timeout = 15000; } @@ -185,7 +183,7 @@ angular.module('zmApp', [ $rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width); $rootScope.devHeight = ((window.innerHeight > 0) ? window.innerHeight : screen.height); console.log("********NEW Computed Dev Width & Height as" + $rootScope.devWidth + "*" + $rootScope.devHeight); - ZMDataModel.zmLog("Device orientation change: "+$rootScope.devWidth + "*" + $rootScope.devHeight); + //ZMDataModel.zmLog("Device orientation change: "+$rootScope.devWidth + "*" + $rootScope.devHeight); }; window.addEventListener("resize", checkOrientation, false); |
