summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-09-17 12:32:47 -0400
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-09-17 12:32:47 -0400
commit7c385a7877aa4b0163dda6206f656846db2cf039 (patch)
tree0dd09ef3261f0eca43cda22d27ab3a431ad1cd2f /www/js
parenta0b74399c4f1a7754029e1fd7f4be3b20836404a (diff)
iOS9 fixes (which includes ionic updates to 1.1.0)
Diffstat (limited to 'www/js')
-rw-r--r--www/js/StateCtrl.js4
-rw-r--r--www/js/app.js1
2 files changed, 5 insertions, 0 deletions
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index 1a512663..988a658c 100644
--- a/www/js/StateCtrl.js
+++ b/www/js/StateCtrl.js
@@ -55,6 +55,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
$http.get(apiCurrentState)
.then(
function (success) {
+ ZMDataModel.zmDebug("State results: " + JSON.stringify(success));
var customStateArray = success.data.states;
var i = 0;
var found = false;
@@ -120,6 +121,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
.then(
function (success) {
ZMDataModel.zmDebug("StateCtrl/getDiskStatus: success");
+ ZMDataModel.zmDebug("Disk results: " + JSON.stringify(success));
var obj = success.data.usage;
if (obj.Total.space != undefined)
{
@@ -158,6 +160,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
.then(
function (success) {
ZMDataModel.zmDebug("StateCtrl/getRunStatus: success");
+ ZMDataModel.zmDebug("Run results: " + JSON.stringify(success));
switch (success.data.result) {
case 1:
$scope.zmRun = 'running';
@@ -196,6 +199,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
$http.get(apiLoad)
.then(
function (success) {
+ ZMDataModel.zmDebug("Load results: " + JSON.stringify(success));
//console.log(JSON.stringify(success));
// load returns 3 params - one in the middle is avg.
ZMDataModel.zmDebug("StateCtrl/getLoadStatus: success");
diff --git a/www/js/app.js b/www/js/app.js
index 2ed58cd6..a9fb624c 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -8,6 +8,7 @@ var appVersion = "0.0.0";
// core app start stuff
angular.module('zmApp', [
'ionic',
+ 'ngIOS9UIWebViewPatch',
'tc.chartjs',
'zmApp.controllers',
'fileLogger',