summaryrefslogtreecommitdiff
path: root/www/js/MontageCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-04-23 15:10:56 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-04-23 15:10:56 -0400
commit57dc82f2214da7ef73beea63c3b9473e12163191 (patch)
tree5349c9f4f3c787e9e0125010d5c2cda62b30862d /www/js/MontageCtrl.js
parent3d47ee0db30c2c550183a5c9bce14080d73b0b30 (diff)
#606 KOing ios with stopNetwork + wait for timeout till we do next http
Diffstat (limited to 'www/js/MontageCtrl.js')
-rw-r--r--www/js/MontageCtrl.js17
1 files changed, 14 insertions, 3 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 90876164..28f74f04 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1930,10 +1930,21 @@ angular.module('zmApp.controllers')
$scope.$on('$ionicView.beforeLeave', function () {
- areStreamsStopped = true;
- viewCleanup();
- viewCleaned = true;
+ if ($rootScope.platformOS == 'ios') {
+ // we need to force a window stop thanks to the webkit streaming bug
+ areStreamsStopped = true;
+ $timeout (function() {NVRDataModel.stopNetwork();viewCleaned = true;});
+
+
+ } else {
+
+ areStreamsStopped = true;
+ viewCleanup();
+ viewCleaned = true;
+
+ }
+
});
$scope.$on('$ionicView.unloaded', function () {