From 27d7668600bb5e3d7b47b97d5cc2abc11bb7136b Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 3 May 2018 11:39:59 -0400
Subject: take off scroll sista, other fixes

---
 www/js/LoginCtrl.js        | 6 ++++++
 www/js/MonitorModalCtrl.js | 3 +--
 www/js/MontageCtrl.js      | 2 ++
 www/js/app.js              | 1 -
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'www/js')

diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 9a21f654..a6d50530 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -261,6 +261,12 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     if ($stateParams.wizard == "true") {
       NVRDataModel.log("Creating new login entry for wizard");
       $scope.loginData = angular.copy(NVRDataModel.getDefaultLoginObject());
+
+      // default object has this as false
+      if ($rootScope.platformOS=='ios') {
+        $scope.loginData.disableSimulStreaming = true;
+      }
+
       $scope.loginData.serverName = $rootScope.wizard.serverName;
       $scope.loginData.url = $rootScope.wizard.loginURL;
       $scope.loginData.apiurl = $rootScope.wizard.apiURL;
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 49fe3741..a863aea3 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -288,8 +288,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     } else { 
     NVRDataModel.killLiveStream($scope.connKey, $scope.controlURL);
     }
-    // $interval.cancel(modalIntervalHandle);
-
+    // $interval.cancel(modalIntervalHandle)
     // FIXME: Do I need to  setAwake(false) here?
   }
 
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index f2f58e53..252a93df 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1728,6 +1728,8 @@ angular.module('zmApp.controllers')
       
         stream += NVRDataModel.insertBasicAuthToken();
 
+
+
       
 //"&rand=" + randToAvoidCacheMem;
       //"&rand="+$scope.randToAvoidCacheMem +
diff --git a/www/js/app.js b/www/js/app.js
index a4ead43a..418bc93d 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -26,7 +26,6 @@ angular.module('zmApp', [
     'ionic-native-transitions',
     'mgo-angular-wizard',
     'pascalprecht.translate',
-    'jett.ionic.scroll.sista',
     'uk.ac.soton.ecs.videogular.plugins.cuepoints',
     'dcbImgFallback',
     'ngImageAppear',
-- 
cgit v1.2.3