summaryrefslogtreecommitdiff
path: root/www/js/EventCtrl.js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-10-31 10:54:32 -0400
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-10-31 10:54:32 -0400
commitb20e0e323bf95ad32520f012bb404efec7d9fed1 (patch)
tree689b160efd45dba33a64f5d4d7a6399814aceb17 /www/js/EventCtrl.js
parent9fd21b4416f88092e6010df90391ec0d851a8f91 (diff)
#59 desktop mode support
Diffstat (limited to 'www/js/EventCtrl.js')
-rw-r--r--www/js/EventCtrl.js17
1 files changed, 16 insertions, 1 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 816d25e4..483e3d55 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -17,7 +17,8 @@ angular.module('zmApp.controllers')
//---------------------------------------------------
var loginData = ZMDataModel.getLogin();
-
+
+
$scope.hours = [];
$scope.days = [];
@@ -87,6 +88,11 @@ angular.module('zmApp.controllers')
$scope.myfilter = "";
$scope.eventCommands = eventCommands;
$scope.loginData = ZMDataModel.getLogin();
+ $scope.playbackURL = $scope.loginData.url;
+ if ($rootScope.platformOS == "unknown")
+ {
+ $scope.playbackURL = zm.desktopUrl;
+ }
$scope.mycarousel = {
index: 0
@@ -1105,6 +1111,15 @@ angular.module('zmApp.controllers')
$scope.eFramesNum = eframes;
$scope.eventDur = Math.round(edur);
$scope.loginData = ZMDataModel.getLogin();
+
+ $scope.playbackURL = $scope.loginData.url;
+ if ($rootScope.platformOS == "unknown")
+ {
+ $scope.playbackURL = zm.desktopUrl;
+ }
+
+
+
$scope.eventBasePath = basepath;
$scope.relativePath = relativepath;
$rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;