summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2016-10-28 14:28:56 -0700
committerPliable Pixels <pliablepixels@gmail.com>2016-10-28 14:28:56 -0700
commit7023f268b6dcf68f6f86589c36d390b9422b7f13 (patch)
tree4c9f3708987fdeefc095e26bdd28f31c274f3d88
parentedead70be5d4055111f6b6dcdd9e39d72b737458 (diff)
if desktop state was not created, I was not loading services #357
-rw-r--r--config.xml2
-rw-r--r--package.json3
-rw-r--r--www/js/app.js5
3 files changed, 7 insertions, 3 deletions
diff --git a/config.xml b/config.xml
index 506aa2ac..db1bc263 100644
--- a/config.xml
+++ b/config.xml
@@ -85,4 +85,6 @@
<icon src="resources/android/icon/drawable-xhdpi-icon.png" />
<plugin name="cordova-sqlite-storage" spec="~1.4.6-pre6a" />
<plugin name="cordova-plugin-settings-hook" spec="~0.2.3" />
+ <engine name="ios" spec="~4.1.1" />
+ <engine name="android" spec="~5.1.1" />
</widget>
diff --git a/package.json b/package.json
index 044fd4c2..cd78efa7 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"@angular/platform-browser-dynamic": "^2.0.0-rc.3",
"@angular/router": "^2.0.0-rc.2",
"async": "^1.4.2",
+ "electron-debug": "^1.0.1",
"gulp": "^3.5.6",
"gulp-concat": "^2.2.0",
"gulp-minify-css": "^0.3.0",
@@ -24,9 +25,9 @@
"clean-css": "^3.4.0",
"gulp-angular-templatecache": "^1.6.0",
"gulp-util": "^2.2.14",
- "shelljs": "^0.3.0",
"jshint": "^2.8.0",
"ng-annotate": "^1.0.2",
+ "shelljs": "^0.3.0",
"uglify-js": "^2.4.24"
},
"cordovaPlugins": [
diff --git a/www/js/app.js b/www/js/app.js
index 59c931de..60a6fe0a 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1497,13 +1497,14 @@ angular.module('zmApp', [
localforage.getItem('last-desktop-state')
.then (function (succ) {
- console.log ("FOUND " + JSON.stringify(succ));
+ // console.log ("FOUND " + JSON.stringify(succ) + ":"+succ);
if (succ)
{
$rootScope.lastState = succ.name;
$rootScope.lastStateParam = succ.params;
- loadServices();
+
}
+ loadServices();
}, function (err) {
console.log ("ERR " + JSON.stringify(err));
loadServices();