summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-10-10 09:10:15 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-10-10 09:10:15 -0400
commit5f89cfff2904b65d8adacb05b7edc8e9e2f356ff (patch)
treeef896ccae21a22c82b0dae7ef78b24b263c8bc95 /www/js
parentadb3927065bc2908f3dc1e88922db5ec37762684 (diff)
bump min ES to 2
Diffstat (limited to 'www/js')
-rwxr-xr-xwww/js/app.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/www/js/app.js b/www/js/app.js
index b3553664..fe42b264 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -44,7 +44,7 @@ angular.module('zmApp', [
.constant('zm', {
minAppVersion: '1.28.107', // if ZM is less than this, the app won't work
recommendedAppVersion: '1.32.0',
- minEventServerVersion: '1.0',
+ minEventServerVersion: '2.0',
castAppId: 'BA30FB4C',
alarmFlashTimer: 20000, // time to flash alarm
gcmSenderId: '710936220256',
@@ -2302,7 +2302,8 @@ angular.module('zmApp', [
method = arguments[0].method;
var isOutgoingRequest = /^(http|https):\/\//.test(url);
if (window.cordova && isOutgoingRequest) {
- //console.log ("**** -->"+method+"<-- using native HTTP with:"+encodeURI(url));
+
+
var d = $q.defer();
var options = {
method: method,
@@ -2311,7 +2312,7 @@ angular.module('zmApp', [
timeout: arguments[0].timeout,
responseType: arguments[0].responseType
};
-
+ console.log ("**** -->"+method+"<-- using native HTTP with:"+encodeURI(url)+" payload:"+JSON.stringify(options));
cordova.plugin.http.sendRequest(encodeURI(url),options,
function (succ) {
// automatic JSON parse if no responseType: text
@@ -2336,7 +2337,7 @@ angular.module('zmApp', [
}
},
function (err) {
- //console.log ("*** Inside native HTTP error: "+JSON.stringify(err));
+ console.log ("*** Inside native HTTP error: "+JSON.stringify(err));
d.reject(err);
return d.promise;