summaryrefslogtreecommitdiff
path: root/www/js/EventCtrl.js
diff options
context:
space:
mode:
authorARC <arjunrc@gmail.com>2015-05-09 19:18:30 -0400
committerARC <arjunrc@gmail.com>2015-05-09 19:18:30 -0400
commitfdb1d93c54e4c67639185f2c859b1fec6a5fb904 (patch)
tree3e4154164a3fc8f349503748b30fd99cd4946607 /www/js/EventCtrl.js
parentbfe426a83bfcd32bac22bc06cccb15f15a9f9450 (diff)
Added support to limit maximum monitors in Montage View and also added a portal alias - those who many not be using one can keep this empty
Diffstat (limited to 'www/js/EventCtrl.js')
-rw-r--r--www/js/EventCtrl.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index d49bc244..8b179016 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -42,7 +42,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion
$scope.$on('$ionicView.unloaded', function () {
console.log("**VIEW ** Events Ctrl Unloaded");
console.log("*** MODAL ** Destroying modal too");
- $scope.modal.remove();
+ if (!($scope.modal===undefined)) {$scope.modal.remove()};
});
@@ -130,10 +130,12 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion
// If I leave it as JSON, it gets converted to OPTONS due
// to CORS behaviour and ZM/Apache don't seem to handle it
+ console.log ("POST: "+loginData.url +'/'+ loginData.alias+'/index.php');
+
var req = $http({
method: 'POST',
/*timeout: 15000,*/
- url: loginData.url + '/zm/index.php',
+ url: loginData.url +'/'+ loginData.alias+'/index.php',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
//'Accept': '*/*',
@@ -210,14 +212,14 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion
// it on open
$scope.closeModal = function () {
console.log("Close & Destroy Modal");
- $scope.modal.remove();
+ if (!($scope.modal===undefined)) {$scope.modal.remove()};
};
//Cleanup the modal when we're done with it
// I Don't think it ever comes here
$scope.$on('$destroy', function () {
console.log("Destroy Modal");
- $scope.modal.remove();
+ if (!($scope.modal===undefined)) {$scope.modal.remove()};
});
console.log("***CALLING EVENTS FACTORY");