0.1.3

- Fixed touchui, webcamtab plugin conflicts - Added Python 3 compatibility
jneilliii · Oct 22, 2019 · 9fb30e0 · 9fb30e0
1 parent 5107b99
commit 9fb30e0
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 66 deletions.
diff --git a/octoprint_consolidate_temp_control/__init__.py b/octoprint_consolidate_temp_control/__init__.py
@@ -31,6 +31,7 @@ def update_hook(self):
 		)
 
 __plugin_name__ = "Consolidate Temp Control"
+__plugin_pythoncompat__ = ">=2.7,<4"
 
 def __plugin_load__():
 	global __plugin_implementation__
@@ -39,7 +40,7 @@ def __plugin_load__():
 	global __plugin_hooks__
 	__plugin_hooks__ = {
 		"octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.update_hook
-	}	
-	
+	}
+
 	global __plugin_settings_overlay__
-	__plugin_settings_overlay__ = dict(appearance=dict(components=dict(order=dict(tab=["plugin_consolidate_temp_control"]))))
+	__plugin_settings_overlay__ = dict(appearance=dict(components=dict(order=dict(tab=["plugin_consolidate_temp_control","temperature","control"]))))
diff --git a/octoprint_consolidate_temp_control/static/js/consolidate_temp_control.js b/octoprint_consolidate_temp_control/static/js/consolidate_temp_control.js
@@ -1,82 +1,113 @@
 $(function() {
-    function ConsolidateTempControlViewModel(parameters) {
-        var self = this;
+	function ConsolidateTempControlViewModel(parameters) {
+		var self = this;
+
+		self.controlViewModel = parameters[0];
+		self.temperatureViewModel = parameters[1];
+		self.settings = parameters[2];
+		self.touchui = parameters[3];
+		self.dragonorder = parameters[4];
+		self.webcamtab = parameters[5];
+
+		// don't load when touchui is active and hide tab.
+		if (self.touchui && self.touchui.isActive()) {
+			$('#tab_plugin_consolidate_temp_control_link, #tab_plugin_consolidate_temp_control').remove();
+			return;
+		}
+
+		// move original temp and control tab content and remove tab links.
+		$('#tabs_content > #temp, #tabs_content > #control').appendTo('#tab_plugin_consolidate_temp_control > div.row-fluid').addClass('span6').removeClass('tab-pane');
+		$('#temp_link, #control_link').remove();
 
-        self.controlViewModel = parameters[0];
-        self.temperatureViewModel = parameters[1];
-
-		// hide orginal temp and control tab
-		$('#control_link,#temp_link').hide();
-
 		// page container adjustments
 		$('div.page-container').css({'min-width':'1900px'});
-		
+
 		// navbar adjustments
 		$('#navbar > div.navbar-inner > div.container').css({'width':'100%'});
 		$('#navbar > div.navbar-inner > div.row-fluid > div.nav-collapse').css({'padding-right':'20px'});
-		
+
 		// main content adjustments
 		$('div.container.octoprint-container').addClass('row-fluid');
 		$('div.container.octoprint-container.row-fluid > div.row').css({'margin-left':'20px','padding-right':'20px'});
-		
+
 		// sidebar adjustments
-		$('div.container.octoprint-container > div.row > div.accordion.span4').removeClass('span4').addClass('span2');
-		$('#files div.row-fluid.upload-buttons > span.btn.btn-primary.fileinput-button.span6:nth-child(2) > span').text('Upload SD');
-
+		if (!self.dragonorder) {
+			$('div.container.octoprint-container > div.row > div.accordion.span4').removeClass('span4').addClass('span2');
+			$('#files div.row-fluid.upload-buttons > span.btn.btn-primary.fileinput-button.span6:nth-child(2) > span').text('Upload SD');
+		}
+
 		// tabs adjustments
-		$('div.container.octoprint-container > div.row > div.tabbable.span8').removeClass('span8').addClass('span10');
-		$('div#tabs_content div.tab-pane:not("#tab_plugin_consolidate_temp_control")').wrapInner('<div class="span6"></div>');
-		$('div#tabs_content div.tab-pane:not("#tab_plugin_consolidate_temp_control") div.span6').wrap('<div class="row-fluid"></div>');
-
+		if($('div#settings_plugin_themeify').length == 0 && !self.dragonorder){
+			$('div.container.octoprint-container > div.row > div.tabbable.span8').removeClass('span8').addClass('span10');
+			$('div#tabs_content div.tab-pane:not("#tab_plugin_consolidate_temp_control")').wrapInner('<div class="span6"></div>');
+			$('div#tabs_content div.tab-pane:not("#tab_plugin_consolidate_temp_control") div.span6').wrap('<div class="row-fluid"></div>');
+		}
+
 		// footer adjustments
 		$('div.container.octoprint-container > div.footer').css({'padding-left':'20px','padding-right':'20px'});
 
-        // fix control tab
-        self.onTabChange = function(current, previous) {
-            if ((current === "#tab_plugin_consolidate_temp_control") || (current === "#temp") || (current === "#control")) {
-                var selected = OctoPrint.coreui.selectedTab;
-                OctoPrint.coreui.selectedTab = "#control";
-                self.controlViewModel.onTabChange("#control", previous);
-                OctoPrint.coreui.selectedTab = selected;
-            } else if (previous === "#tab_plugin_consolidate_temp_control") {
-                self.controlViewModel.onTabChange(current, "#control");
-            }
-        };
+		// fix control tab
+		self.onTabChange = function(current, previous) {
+			if ((current === "#tab_plugin_consolidate_temp_control") || (current === "#temp") || (current === "#control") || (current === "#tab_plugin_webcamtab")) {
+				var selected = OctoPrint.coreui.selectedTab;
+				if (self.webcamtab) {
+					OctoPrint.coreui.selectedTab = "#tab_plugin_webcamtab";
+					self.controlViewModel.onTabChange("#tab_plugin_webcamtab", previous);
+				} else {
+					OctoPrint.coreui.selectedTab = "#control";
+					self.controlViewModel.onTabChange("#control", previous);
+				}
+				OctoPrint.coreui.selectedTab = selected;
+			} else if (previous === "#tab_plugin_consolidate_temp_control") {
+				self.controlViewModel.onTabChange(current, "#control");
+			}
+		};
 
-        self.onAllBound = function(allViewModels) {
+		self.onAllBound = function(allViewModels) {
 			var selected = OctoPrint.coreui.selectedTab;
-			OctoPrint.coreui.selectedTab = "#control";
+			if (self.webcamtab) {
+				OctoPrint.coreui.selectedTab = "#tab_plugin_webcamtab";
+			} else {
+				OctoPrint.coreui.selectedTab = "#control";
+			}
 			self.controlViewModel.onAllBound(allViewModels);
 			OctoPrint.coreui.selectedTab = selected;
-			self.temperatureViewModel._initializePlot();
-        };
-
-        self.controlViewModel.onBrowserTabVisibilityChange = function(status) {
-            if (status) {
-                var selected = OctoPrint.coreui.selectedTab;
-				OctoPrint.coreui.selectedTab = "#control";
-                self.controlViewModel._enableWebcam();
-                OctoPrint.coreui.selectedTab = selected;
-            } else {
-                self.controlViewModel._disableWebcam();
-            }
-        };
+			if (selected == "#tab_plugin_consolidate_temp_control" || selected == "#temp") {
+				self.temperatureViewModel._initializePlot();
+			}
+		};
+
+		self.controlViewModel.onBrowserTabVisibilityChange = function(status) {
+			if (status) {
+				var selected = OctoPrint.coreui.selectedTab;
+				if (self.webcamtab) {
+					OctoPrint.coreui.selectedTab = "#tab_plugin_webcamtab";
+				} else {
+					OctoPrint.coreui.selectedTab = "#control";
+				}
+				self.controlViewModel._enableWebcam();
+				OctoPrint.coreui.selectedTab = selected;
+			} else {
+				self.controlViewModel._disableWebcam();
+			}
+		};
 
-        // fix temperature tab
-        self.onAfterTabChange = function(current, previous) {
-            if ((current === "#tab_plugin_consolidate_temp_control") || (current === "#temp") || (current === "#control")) {
+		// fix temperature tab
+		self.onAfterTabChange = function(current, previous) {
+			if ((current === "#tab_plugin_consolidate_temp_control") || (current === "#temp") || (current === "#control")) {
 				if (!self.temperatureViewModel.plot) {
 					self.temperatureViewModel._initializePlot();
 				} else {
 					self.temperatureViewModel.updatePlot();
-				}				
-                self.temperatureViewModel.onAfterTabChange("#temp", previous);
-            } 
-        }
-    }
+				}
+				self.temperatureViewModel.onAfterTabChange("#temp", previous);
+			} 
+		}
+	}
 
-    OCTOPRINT_VIEWMODELS.push({
-        construct: ConsolidateTempControlViewModel,
-        dependencies: ["controlViewModel", "temperatureViewModel"]
-    });
+	OCTOPRINT_VIEWMODELS.push({
+		construct: ConsolidateTempControlViewModel,
+		dependencies: ["controlViewModel", "temperatureViewModel", "settingsViewModel", "touchUIViewModel", "dragon_orderViewModel", "WebcamTabViewModel"],
+		optional: ["touchUIViewModel", "dragon_orderViewModel", "WebcamTabViewModel"]
+	});
 });
diff --git a/octoprint_consolidate_temp_control/templates/consolidate_temp_control_tab.jinja2 b/octoprint_consolidate_temp_control/templates/consolidate_temp_control_tab.jinja2
@@ -1,8 +1,3 @@
 <div class="row-fluid">
-	<div id="temp" class="span6">
-		{% include 'tabs/temperature.jinja2' %}
-	</div>
-	<div id="control" class="span6">
-		{% include 'tabs/control.jinja2' %}
-	</div>
+
 </div>
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-ConsolidateTempControl"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.2"
+plugin_version = "0.1.3"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module