🐛 Modal did not open #38

BillyBlaze · Apr 23, 2016 · 29d04b6 · 29d04b6
1 parent 4bd6773
commit 29d04b6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/octoprint_touchui/static/css/touchui.css b/octoprint_touchui/static/css/touchui.css
diff --git a/octoprint_touchui/static/js/touchui.bundled.js b/octoprint_touchui/static/js/touchui.bundled.js
@@ -616,6 +616,8 @@ TouchUI.prototype.components.touchscreen = {
 		if (this.settings.isEpiphanyOrKweb) {
 			this.settings.hasFullscreen(false);
 		}
+
+		$('.modal.fade').removeClass('fade');
 
 		// Improve performace
 		this.scroll.defaults.iScroll.scrollbars = false;
@@ -2016,14 +2018,13 @@ TouchUI.prototype.DOM.overwrite.modal = function() {
 
 	//We need a reliable event for catching new modals for attaching a scrolling bar
 	$.fn.modalBup = $.fn.modal;
-	$.fn.modal = function(option, args) {
+	$.fn.modal = function(options, args) {
 		// Update any other modifications made by others (i.e. OctoPrint itself)
 		$.fn.modalBup.defaults = $.fn.modal.defaults;
 
 		// Create modal, store into variable so we can trigger an event first before return
-		var tmp = $(this).modalBup(option, args);
+		var tmp = $(this).modalBup(options, args);
 		$(this).trigger("modal.touchui", this);
-
 		return tmp;
 	};
 	$.fn.modal.prototype = { constructor: $.fn.modal };

diff --git a/octoprint_touchui/static/js/touchui.libraries.js b/octoprint_touchui/static/js/touchui.libraries.js
diff --git a/octoprint_touchui/static/less/touchui.bundled.less b/octoprint_touchui/static/less/touchui.bundled.less
@@ -4276,6 +4276,7 @@ width: 95% !important;
 margin: 0 !important;
 min-height: 100%;
 margin-left: -110% !important;
+display: block;
 .box-sizing(border-box);
 .slimScrollDiv, #settings_plugin_pluginmanager_repositorydialog_list {
 height: auto !important;

diff --git a/source/js/components/touchscreen.js b/source/js/components/touchscreen.js
@@ -8,6 +8,8 @@ TouchUI.prototype.components.touchscreen = {
 		if (this.settings.isEpiphanyOrKweb) {
 			this.settings.hasFullscreen(false);
 		}
+
+		$('.modal.fade').removeClass('fade');
 
 		// Improve performace
 		this.scroll.defaults.iScroll.scrollbars = false;

diff --git a/source/js/dom/overwrite/modal.js b/source/js/dom/overwrite/modal.js
@@ -2,14 +2,13 @@ TouchUI.prototype.DOM.overwrite.modal = function() {
 
 	//We need a reliable event for catching new modals for attaching a scrolling bar
 	$.fn.modalBup = $.fn.modal;
-	$.fn.modal = function(option, args) {
+	$.fn.modal = function(options, args) {
 		// Update any other modifications made by others (i.e. OctoPrint itself)
 		$.fn.modalBup.defaults = $.fn.modal.defaults;
 
 		// Create modal, store into variable so we can trigger an event first before return
-		var tmp = $(this).modalBup(option, args);
+		var tmp = $(this).modalBup(options, args);
 		$(this).trigger("modal.touchui", this);
-
 		return tmp;
 	};
 	$.fn.modal.prototype = { constructor: $.fn.modal };

diff --git a/source/less/components/modal.less b/source/less/components/modal.less
@@ -57,6 +57,7 @@
 		margin: 0 !important;
 		min-height: 100%;
 		margin-left: -110% !important;
+		display: block;
 
 		.box-sizing(border-box);