From 1a57bffce7252be73589f503db9ae8151ecc4f19 Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Fri, 6 Nov 2015 15:17:11 -0500
Subject: support for electron desktop apps

---
 www/js/EventCtrl.js   | 8 ++++++--
 www/js/app.js         | 3 ++-
 www/js/controllers.js | 6 ++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'www')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index cbf0329e..a2b79638 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -122,10 +122,12 @@ angular.module('zmApp.controllers')
         $scope.eventCommands = eventCommands;
         $scope.loginData = ZMDataModel.getLogin();
         $scope.playbackURL = $scope.loginData.url;
+        /* not needed for electron
         if ($rootScope.platformOS == "desktop") {
             $scope.playbackURL = zm.desktopUrl;
         }
-
+        */
+        
         $scope.mycarousel = {
             index: 0
         };
@@ -1453,9 +1455,11 @@ angular.module('zmApp.controllers')
                         $scope.videoObject = event.Event.video;
 
                         $scope.playbackURL = $scope.loginData.url;
+                
+                        /* we don't need this for electron
                         if ($rootScope.platformOS == "desktop") {
                             $scope.playbackURL = zm.desktopUrl;
-                        }
+                        } */
 
                         $scope.eventBasePath = event.Event.BasePath;
                         $scope.relativePath = event.Event.relativePath;
diff --git a/www/js/app.js b/www/js/app.js
index dcc80ae6..d65e6d33 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -208,6 +208,7 @@ angular.module('zmApp', [
         'request': function (config) {
             
             
+            /* - we don't need this with electron 
             if ($rootScope.platformOS == "desktop")
             {
                 var zmD = $injector.get('ZMDataModel');
@@ -226,7 +227,7 @@ angular.module('zmApp', [
                 
                 
             }
-            
+            */
             
             // config.withCredentials = true;
             if (zmCookie) {
diff --git a/www/js/controllers.js b/www/js/controllers.js
index 80afa2fe..cbb8fa9e 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -20,5 +20,11 @@ angular.module('zmApp.controllers', ['ionic', 'ngCordova', 'ng-mfb','angularCirc
 
         
 }, 100);
+
+    // Added for electron build to stop title propagation
+    $scope.$on('$ionicView.afterEnter', function(ev, data) { 
+      ev.stopPropagation();
+  });
+
 });
 
-- 
cgit v1.2.3