Merge pull request #30 from Willmac16/master

Python 3 support + Fix for #28

Author: synman

Diff for: octoprint_bettergrblsupport/__init__.py

@@ -978,6 +978,7 @@ def get_update_information(self):
 # can be overwritten via __plugin_xyz__ control properties. See the documentation for that.
 
 __plugin_name__ = 'Better Grbl Support'
+__plugin_pythoncompat__ = ">=2.7,<4"
 
 def __plugin_load__():
     global __plugin_implementation__

Diff for: octoprint_bettergrblsupport/static/js/bettergrblsupport.js

@@ -202,7 +202,7 @@ $(function() {
           var streamImg = document.getElementById("webcam_image_framing");
 
           if (current == "#tab_plugin_bettergrblsupport") {
-              streamImg.src = "/webcam/?action=stream&" + Math.floor(Math.random() * 1000000);   ;
+              streamImg.src = self.settings.settings.webcam.streamUrl() + "&nonce=" + Math.floor(Math.random() * 1000000);
           } else if (previous == "#tab_plugin_bettergrblsupport") {
               streamImg.src = "about:blank";
           }