diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/LoginCtrl.js | 6 | ||||
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 3 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 2 | ||||
| -rwxr-xr-x | www/js/app.js | 1 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 | ||||
| -rw-r--r-- | www/templates/timeline.html | 2 |
6 files changed, 11 insertions, 5 deletions
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', diff --git a/www/templates/montage.html b/www/templates/montage.html index 6a877936..d434de84 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -24,7 +24,7 @@ </button> </ion-nav-buttons> <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false"> - <!--<ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false">--> + <div ng-if="areImagesLoading" class="screen-note"> {{ 'kArrangingImages' | translate }}... </div> diff --git a/www/templates/timeline.html b/www/templates/timeline.html index 87785fe8..80f83e8a 100644 --- a/www/templates/timeline.html +++ b/www/templates/timeline.html @@ -17,7 +17,7 @@ <button class="button button-icon button-clear ion-log-out" ng-click="zoom(0.2)"></button> --> </ion-nav-buttons> <!--<ion-content data-tap-disabled="true">--> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> + <ion-content delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> <div style="padding-left:15px; font-size:10px; color:grey"> {{prettify(fromDate)}} - {{prettify(toDate)}} {{tzAbbr}} ({{'kTimelineOnlyDisplaying1' | translate:translationData}}) <strong> |