pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1780: Safari Webcam Fix.

Browse source
This commit is contained in:
Greg Hulands 2017-02-20 11:02:07 -08:00
parent bac972de53
commit e82efd24d3
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/octoprint/static/js/app/viewmodels/control.js
View file

@ -362,9 +362,21 @@ $(function() {
self.onSettingsBeforeSave = self.updateRotatorWidth; self.onSettingsBeforeSave = self.updateRotatorWidth;
self._isSafari = function() {
var is_chrome = navigator.userAgent.indexOf('Chrome') > -1;
var is_safari = navigator.userAgent.indexOf("Safari") > -1;
return is_safari && !is_chrome;
}
self._disableWebcam = function() { self._disableWebcam = function() {
// only disable webcam stream if tab is out of focus for more than 5s, otherwise we might cause // only disable webcam stream if tab is out of focus for more than 5s, otherwise we might cause
// more load by the constant connection creation than by the actual webcam stream // more load by the constant connection creation than by the actual webcam stream
// safari bug doesn't release the mjpeg stream, so we just disable this for safari.
if (self._isSafari()) {
return;
}
self.webcamDisableTimeout = setTimeout(function () { self.webcamDisableTimeout = setTimeout(function () {
$("#webcam_image").attr("src", ""); $("#webcam_image").attr("src", "");
}, 5000); }, 5000);
@ -380,6 +392,12 @@ $(function() {
} }
var webcamImage = $("#webcam_image"); var webcamImage = $("#webcam_image");
var currentSrc = webcamImage.attr("src"); var currentSrc = webcamImage.attr("src");
// safari bug doesn't release the mjpeg stream, so we just set it up the once
if (self._isSafari() && currentSrc != undefined) {
return;
}
var newSrc = self.settings.webcam_streamUrl(); var newSrc = self.settings.webcam_streamUrl();
if (currentSrc != newSrc) { if (currentSrc != newSrc) {
if (newSrc.lastIndexOf("?") > -1) { if (newSrc.lastIndexOf("?") > -1) {