🎨 Show errors again

On touchscreen devices we want to be shown the error, however octoprint use try {} catch which prevented window.onerror from triggering. Therefor override the loglevel function and call
BillyBlaze · Sep 9, 2018 · 4337928 · 4337928
1 parent 4a73bb1
commit 4337928
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/octoprint_touchui/static/js/touchui.bootstrap.js b/octoprint_touchui/static/js/touchui.bootstrap.js
diff --git a/octoprint_touchui/static/js/touchui.bundled.js b/octoprint_touchui/static/js/touchui.bundled.js
@@ -651,10 +651,6 @@ TouchUI.prototype.core.init = function() {
 		// Send Touchscreen loading status
 		if (window.top.postMessage) {
 			window.top.postMessage("loading", "*");
-
-			$(window).on("error.touchui", function(event) {
-				window.top.postMessage([event.originalEvent.message, event.originalEvent.filename], "*");
-			});
 		}
 
 		// Attach id for TouchUI styling
@@ -2151,7 +2147,6 @@ TouchUI.prototype.DOM.move.sidebar = {
 
 	init: function() {
 		var tabbar = this.DOM.create.tabbar;
-
 		$(this.DOM.move.sidebar.items + ':not(' + this.DOM.move.sidebar.doNotMove + ')').each(function(ind, elm) {
 			var id = $(elm).attr('id');
 

diff --git a/octoprint_touchui/templates/touchui_load_css.jinja2 b/octoprint_touchui/templates/touchui_load_css.jinja2
@@ -1 +1 @@
-<link href="{{ plugin_touchui_cssPath }}?{{ plugin_touchui_timestamp }}" rel="stylesheet" id="touchui-css" media="screen">
+<link href="{{ plugin_touchui_cssPath }}?{{ plugin_touchui_timestamp }}" rel="stylesheet" id="touchui-css" media="screen">
diff --git a/source/js/bootstrap.js b/source/js/bootstrap.js
@@ -1,5 +1,14 @@
 !function() {
 
+	// Catch errors
+	if (window.log && window.log.error) {
+		var old = window.log.error;
+		window.log.error = function(plugin, msg) {
+			window.top.postMessage([msg, ''], "*");
+			old.apply(window.log, arguments);
+		}
+	}
+
 	var Touch = new TouchUI();
 	Touch.domLoading();
 

diff --git a/source/js/core/_init.js b/source/js/core/_init.js
@@ -9,10 +9,6 @@ TouchUI.prototype.core.init = function() {
 		// Send Touchscreen loading status
 		if (window.top.postMessage) {
 			window.top.postMessage("loading", "*");
-
-			$(window).on("error.touchui", function(event) {
-				window.top.postMessage([event.originalEvent.message, event.originalEvent.filename], "*");
-			});
 		}
 
 		// Attach id for TouchUI styling

diff --git a/source/js/dom/move/sidebar.js b/source/js/dom/move/sidebar.js
@@ -17,7 +17,6 @@ TouchUI.prototype.DOM.move.sidebar = {
 
 	init: function() {
 		var tabbar = this.DOM.create.tabbar;
-
 		$(this.DOM.move.sidebar.items + ':not(' + this.DOM.move.sidebar.doNotMove + ')').each(function(ind, elm) {
 			var id = $(elm).attr('id');
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<link href="{{ plugin_touchui_cssPath }}?{{ plugin_touchui_timestamp }}" rel="stylesheet" id="touchui-css" media="screen">
		<link href="{{ plugin_touchui_cssPath }}?{{ plugin_touchui_timestamp }}" rel="stylesheet" id="touchui-css" media="screen">