Merge branch 'develop'

README.md

@@ -1,6 +1,6 @@
 # OctoPrint-WebcamTab
 
-This OctoPrint plugin relocates the webcam stream into a separate tab.
+This OctoPrint plugin moves the webcam stream from the controls into its own tab. Keyboard control is still possible and it is compatible with the [FullScreen Plugin](https://github.com/BillyBlaze/OctoPrint-FullScreen).
 
 ## Setup
 

octoprint_webcamtab/__init__.py

@@ -22,7 +22,7 @@ def get_assets(self):
 
     def get_template_configs(self):
         return [
-            dict(type="tab", name="Webcam")
+            dict(type="tab", name="Webcam", template=None)
         ]
 
     # Softwareupdate hook

octoprint_webcamtab/static/js/webcamtab.js

@@ -51,14 +51,15 @@ $(function() {
             }
         };
 
-        self.onStartup = function() {
-            var container = $("#control #webcam_container");
-            if (container.length) {
-                var hint = container.next();
-                if (hint.attr("data-bind") === "visible: keycontrolPossible") {
-                    hint.remove();
+        self.onAfterBinding = function() {
+            var tab = $("#tab_plugin_webcamtab");
+            var webcam = $("#webcam_container");
+            if (webcam) {
+                var hint = webcam.next();
+                tab.append(webcam.detach());
+                if (hint && hint.attr("data-bind") === "visible: keycontrolPossible") {
+                    tab.append(hint.detach());
                 }
-                container.remove();
             }
         };
     };

setup.py

@@ -6,7 +6,7 @@
 plugin_identifier = "webcamtab"
 plugin_package = "octoprint_webcamtab"
 plugin_name = "OctoPrint-WebcamTab"
-plugin_version = "0.1.1"
+plugin_version = "0.1.2"
 plugin_description = """Show webcam stream in separate tab"""
 plugin_author = "Sven Lohrmann"
 plugin_author_email = "[email protected]"