summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-04-14 18:01:00 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-04-14 18:01:00 -0400
commit40e07fd39fa64b174cfe79312a96f9b82d72d4b4 (patch)
tree97566446e4f45d2623279a0a5499d8f389a775f0 /www/js/DataModel.js
parent057f40889202702fc8464b4d6f68dc1863bec6d7 (diff)
#602 #606 - iOS won't support multiport. Webkit bug see https://bugs.webkit.org/show_bug.cgi?id=35377
Diffstat (limited to 'www/js/DataModel.js')
-rwxr-xr-xwww/js/DataModel.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index a98b9af5..a7badad8 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -848,7 +848,13 @@ angular.module('zmApp.controllers')
if (typeof loginData.disableSimulStreaming == 'undefined') {
loginData.disableSimulStreaming = false;
+
}
+ // iOS it is always off, webkit bug
+
+ if ($rootScope.platformOS=='ios') {
+ loginData.disableSimulStreaming = true;
+ }
if (typeof loginData.exitOnSleep == 'undefined') {
debug("exitOnSleep does not exist. Setting to false");
@@ -1150,7 +1156,7 @@ angular.module('zmApp.controllers')
} else {
log(s + " stopNework: Calling window.stop()");
- $timeout (function() {window.stop();},10);
+ $timeout (function() {window.stop();});
}
},