Merge branch 'develop'
This commit is contained in:
commit
b4fe916085
@ -32,7 +32,7 @@ $(function() {
|
|||||||
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
|
// safari bug doesn't release the mjpeg stream, so we just set it up the once
|
||||||
if (self.control._isSafari() && currentSrc != undefined) {
|
if (OctoPrint.coreui.browser.safari && currentSrc != undefined) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
setup.py
2
setup.py
@ -6,7 +6,7 @@ from setuptools import setup
|
|||||||
plugin_identifier = "webcamtab"
|
plugin_identifier = "webcamtab"
|
||||||
plugin_package = "octoprint_webcamtab"
|
plugin_package = "octoprint_webcamtab"
|
||||||
plugin_name = "OctoPrint-WebcamTab"
|
plugin_name = "OctoPrint-WebcamTab"
|
||||||
plugin_version = "0.1.0"
|
plugin_version = "0.1.1"
|
||||||
plugin_description = """Show webcam stream in separate tab"""
|
plugin_description = """Show webcam stream in separate tab"""
|
||||||
plugin_author = "Sven Lohrmann"
|
plugin_author = "Sven Lohrmann"
|
||||||
plugin_author_email = "malnvenshorn@gmail.com"
|
plugin_author_email = "malnvenshorn@gmail.com"
|
||||||
|
Loading…
Reference in New Issue
Block a user