summaryrefslogtreecommitdiff
path: root/www/js/EventCtrl.js
diff options
context:
space:
mode:
authorARC <arjunrc@gmail.com>2015-05-01 14:52:22 -0400
committerARC <arjunrc@gmail.com>2015-05-01 14:52:22 -0400
commit9faf95be527b8b7c23e4ed4226c35bb771129f41 (patch)
tree6d5baa8fc0b2a06d2ccb46ad9be75cce64bc34e8 /www/js/EventCtrl.js
parentbcdc2629d7b289c48776169c350d8da3b74f64d4 (diff)
Made various tweaks to config files and code to make things work on Android. Using crosswalk for Android for better performance
Diffstat (limited to 'www/js/EventCtrl.js')
-rw-r--r--www/js/EventCtrl.js19
1 files changed, 7 insertions, 12 deletions
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 = [];