From 9faf95be527b8b7c23e4ed4226c35bb771129f41 Mon Sep 17 00:00:00 2001 From: ARC Date: Fri, 1 May 2015 14:52:22 -0400 Subject: Made various tweaks to config files and code to make things work on Android. Using crosswalk for Android for better performance --- www/js/EventCtrl.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'www/js/EventCtrl.js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index fadc9f65..963ef3d3 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -56,18 +56,12 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion play: "2" } - $scope.initLoadingImage = function() - { - console.log ("***Loading***"); - /* $ionicLoading.show({ - template: "loading, please wait...", - noBackdrop: true, - });*/ - } + $scope.finishedLoadingImage = function() { + console.log ("*** Events image FINISHED loading ***"); $ionicLoading.hide(); // alert ("IMAGE LOADED"); } @@ -93,7 +87,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion $ionicLoading.show({ template: "please wait...", noBackdrop: true, - + duration: 10000, }); var loginData = ZMDataModel.getLogin(); @@ -123,13 +117,14 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion break; }; - + console.log ("** POST URL " +loginData.url+ 'zm/index.php'); var req = $http({ method: 'POST', - url: loginData.url + 'zm/index.php', + timeout: 10000, + url: loginData.url + '/zm/index.php', headers: { 'Content-Type': 'application/x-www-form-urlencoded', - 'Accept': '*/*', + //'Accept': '*/*', }, transformRequest: function (obj) { var str = []; -- cgit v1.2.3