From 92e3bef0c9e0f2e8856806028852a23e4a160303 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Thu, 19 Nov 2015 14:24:02 -0500 Subject: #99 - removed extra cgi-bin Former-commit-id: 2425d1928cabfab2cf4c88b5820e1676d7fde89f --- www/js/ModalCtrl.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'www/js/ModalCtrl.js') diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index e9365186..6bf208a0 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -478,13 +478,13 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco var canvas, context, imageDataUrl, imageData; var loginData = ZMDataModel.getLogin(); var url = loginData.streamingurl + - '/cgi-bin/zms?mode=single&monitor=' + mid + + '/zms?mode=single&monitor=' + mid + $rootScope.authSession; ZMDataModel.zmLog("SavetoPhone:Trying to save image from " + url); var img = new Image(); img.onload = function () { - console.log("********* ONLOAD"); + // console.log("********* ONLOAD"); canvas = document.createElement('canvas'); canvas.width = img.width; canvas.height = img.height; @@ -496,7 +496,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco if ($rootScope.platformOS != "desktop") { try { - + cordova.exec( SaveSuccess, SaveError, @@ -519,6 +519,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco }; try { img.src = url; + // console.log ("SAVING IMAGE SOURCE"); } catch (e) { SaveError(e.message); @@ -1011,7 +1012,8 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco $scope.$on('modal.shown', function() { console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Modal is shown!'); currentEvent=$scope.currentEvent; - prepareModalEvent(currentEvent.Event.Id); + if (currentEvent && currentEvent.Event) + prepareModalEvent(currentEvent.Event.Id); }); }]); \ No newline at end of file -- cgit v1.2.3