From e89da9fad0711e6057e2ab10b94b65b2bf89ca2a Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Tue, 20 Nov 2018 12:46:26 -0800 Subject: [PATCH 1/3] Revert "Fix Nano scrolling issues (in a shitty way)" This reverts commit 16c987c84953062d9f465372bce8b16100757cf6. --- nano/assets/nano.js | 5 ----- nano/scripts/nano/nano_window.js | 5 ----- 2 files changed, 10 deletions(-) diff --git a/nano/assets/nano.js b/nano/assets/nano.js index 011000a3136..ff92abf825a 100644 --- a/nano/assets/nano.js +++ b/nano/assets/nano.js @@ -1379,11 +1379,6 @@ var NanoWindow = function () var setupScroll = function() { $("#cornerWrapper").focus(); - $("#uiContent").on("click", function (event) { - event = event || window.event; - event.stopPropagation(); - $("#cornerWrapper").focus(); - }) }; var fancyChrome = function() { diff --git a/nano/scripts/nano/nano_window.js b/nano/scripts/nano/nano_window.js index 96a22ee63a1..1f97da05c6d 100644 --- a/nano/scripts/nano/nano_window.js +++ b/nano/scripts/nano/nano_window.js @@ -61,11 +61,6 @@ var NanoWindow = function () var setupScroll = function() { $("#cornerWrapper").focus(); - $("#uiContent").on("click", function (event) { - event = event || window.event; - event.stopPropagation(); - $("#cornerWrapper").focus(); - }) }; var fancyChrome = function() { From 12f7bb069c6d037a60fcd6737ab92787f02c89c3 Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Tue, 20 Nov 2018 12:46:42 -0800 Subject: [PATCH 2/3] Revert "Fix computer3" This reverts commit 37ce8f860536ada06905988968e145247cd0c701. --- nano/layouts/layout_program.tmpl | 71 ++++++++++++++++---------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/nano/layouts/layout_program.tmpl b/nano/layouts/layout_program.tmpl index b11997b84c8..36f1d8a7e7a 100644 --- a/nano/layouts/layout_program.tmpl +++ b/nano/layouts/layout_program.tmpl @@ -7,6 +7,42 @@
 
+ +
+
+ + {{if data.PC_batteryicon && data.PC_showbatteryicon}} +
+ {{/if}} + {{if data.PC_batterypercent && data.PC_showbatteryicon}} + {{:data.PC_batterypercent}} + {{/if}} + {{if data.PC_ntneticon}} + + {{/if}} + {{if data.PC_apclinkicon}} + + {{/if}} + {{if data.PC_stationtime}} + {{:data.PC_stationtime}} + {{/if}} + {{for data.PC_programheaders}} + + {{/for}} +
+
+
+
+
+ +
{{:helper.link('Shutdown', 'power-off', {'action' : 'PC_shutdown'})}} + {{if data.PC_showexitprogram}} + {{:helper.link('EXIT PROGRAM', 'times', {'action' : 'PC_exit'})}} + {{:helper.link('Minimize Program', 'minus', {'action' : 'PC_minimize'})}} + {{/if}} +
+
+
@@ -16,41 +52,6 @@
-
-
- - {{if data.PC_batteryicon && data.PC_showbatteryicon}} -
- {{/if}} - {{if data.PC_batterypercent && data.PC_showbatteryicon}} - {{:data.PC_batterypercent}} - {{/if}} - {{if data.PC_ntneticon}} - - {{/if}} - {{if data.PC_apclinkicon}} - - {{/if}} - {{if data.PC_stationtime}} - {{:data.PC_stationtime}} - {{/if}} - {{for data.PC_programheaders}} - - {{/for}} -
-
-
-
-
- -
{{:helper.link('Shutdown', 'power-off', {'action' : 'PC_shutdown'})}} - {{if data.PC_showexitprogram}} - {{:helper.link('EXIT PROGRAM', 'times', {'action' : 'PC_exit'})}} - {{:helper.link('Minimize Program', 'minus', {'action' : 'PC_minimize'})}} - {{/if}} -
-
-