Merge branch 'experimental' of https://github.com/kliment/Printrun into experimental

pronterface.py

@@ -313,16 +313,16 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         if f>0:
             wx.CallAfter(self.btemp.SetValue, str(f))
             self.set("last_bed_temperature", str(f))
-            wx.CallAfter(self.setboff.SetBackgroundColour, "")
-            wx.CallAfter(self.setboff.SetForegroundColour, "")
+            wx.CallAfter(self.setboff.SetBackgroundColour, None)
+            wx.CallAfter(self.setboff.SetForegroundColour, None)
             wx.CallAfter(self.setbbtn.SetBackgroundColour, "#FFAA66")
             wx.CallAfter(self.setbbtn.SetForegroundColour, "#660000")
             wx.CallAfter(self.btemp.SetBackgroundColour, "#FFDABB")
         else:
             wx.CallAfter(self.setboff.SetBackgroundColour, "#0044CC")
             wx.CallAfter(self.setboff.SetForegroundColour, "white")
-            wx.CallAfter(self.setbbtn.SetBackgroundColour, "")
-            wx.CallAfter(self.setbbtn.SetForegroundColour, "")
+            wx.CallAfter(self.setbbtn.SetBackgroundColour, None)
+            wx.CallAfter(self.setbbtn.SetForegroundColour, None)
             wx.CallAfter(self.btemp.SetBackgroundColour, "white")
             wx.CallAfter(self.btemp.Refresh)
 
@@ -332,16 +332,16 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         if f > 0:
             wx.CallAfter(self.htemp.SetValue, str(f))
             self.set("last_temperature", str(f))
-            wx.CallAfter(self.settoff.SetBackgroundColour, "")
-            wx.CallAfter(self.settoff.SetForegroundColour, "")
+            wx.CallAfter(self.settoff.SetBackgroundColour, None)
+            wx.CallAfter(self.settoff.SetForegroundColour, None)
             wx.CallAfter(self.settbtn.SetBackgroundColour, "#FFAA66")
             wx.CallAfter(self.settbtn.SetForegroundColour, "#660000")
             wx.CallAfter(self.htemp.SetBackgroundColour, "#FFDABB")
         else:
             wx.CallAfter(self.settoff.SetBackgroundColour, "#0044CC")
             wx.CallAfter(self.settoff.SetForegroundColour, "white")
-            wx.CallAfter(self.settbtn.SetBackgroundColour, "")
-            wx.CallAfter(self.settbtn.SetForegroundColour, "")
+            wx.CallAfter(self.settbtn.SetBackgroundColour, None)
+            wx.CallAfter(self.settbtn.SetForegroundColour, None)
             wx.CallAfter(self.htemp.SetBackgroundColour, "white")
             wx.CallAfter(self.htemp.Refresh)
 

web/js/asyncCommand.js

+function pronterfaceWebInterface_setup(){
+	pronterfaceWebInterface_attachAsync();
+}
+
+function pronterfaceWebInterface_attachAsync(){
+	
+	var list = [];
+	if(document.getElementsByClassName){
+		list = document.getElementsByClassName('command');
+	}else if(document.getElementsByTagName){
+		list = document.getElementsByTagName('a');
+		list.concat( document.getElementsByTagName('area') );
+		//TODO filter list via checking the className attributes
+	}else{
+		console && console.error && console.error('unable to gather list of elements');
+		return false;
+	}
+	
+	for(var i=0; i < list.length; i++){
+		list[i].addEventListener && list[i].addEventListener( 'click', function(e){return pronterfaceWebInterface_asyncCommand(null, e);}, true );
+		list[i].attachEvent && list[i].attachEvent( 'onclick', function(e){return pronterfaceWebInterface_asyncCommand(null, e);} );
+	}
+	
+	return true;
+}
+
+
+function pronterfaceWebInterface_asyncCommand( urlOrElement, event ){
+
+	if( ! urlOrElement && event.target)
+		urlOrElement = event.target;
+
+	var url = null;
+	if( typeof urlOrElement == 'string' ){
+		url = urlOrElement;
+	}else{
+		url = urlOrElement&&urlOrElement.href;
+	}
+
+	if( typeof url != 'string' ){
+		console && console.error && console.error('url not a string', urlOrElement, url);
+		return true;
+	}
+
+	var httpRequest;
+	if (window.XMLHttpRequest) { // Mozilla, Safari, ...
+		httpRequest = new XMLHttpRequest();
+	} else if (window.ActiveXObject) { // IE 8 and older
+		httpRequest = new ActiveXObject("Microsoft.XMLHTTP");
+	}
+	
+	if( ! httpRequest ){
+		alert('no AJAX available?');
+		// follow link
+		return true;
+	}
+	
+	//onreadystatechange
+	//onerror
+	httpRequest.open( 'GET', url, true);
+	httpRequest.send(null);
+	
+	// don't follow link
+	if( event ){
+		event.stopImmediatePropagation && event.stopImmediatePropagation();
+		event.defaultPrevented = true;
+		event.preventDefault && event.preventDefault();
+	}
+	return false;
+}
+
+
+if (document.addEventListener) {
+    document.addEventListener("DOMContentLoaded", pronterfaceWebInterface_setup, false);
+} else if (document.attachEvent) {
+    document.attachEvent("onreadystatechange", pronterfaceWebInterface_setup);
+} else {
+    document.onload = pronterfaceWebInterface_setup;
+}