From 637e36c40b031be2b7b3c182de935eb32ac0990f Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Mon, 1 Jun 2020 21:35:19 -0400
Subject: [PATCH] remove non-compact mode

---
 js/kiri-conf.js |  1 -
 js/kiri-init.js | 16 +---------------
 js/moto-ui.js   | 41 ++++++++++-------------------------------
 3 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/js/kiri-conf.js b/js/kiri-conf.js
index b3bb2859..566f46c4 100644
--- a/js/kiri-conf.js
+++ b/js/kiri-conf.js
@@ -542,7 +542,6 @@ let gs_kiri_conf = exports;
                 view: null,
                 dark: false,
                 expert: false,
-                compact: false,
                 zoomSpeed: 1.0,
                 reverseZoom: true,
                 showOrigin: false,
diff --git a/js/kiri-init.js b/js/kiri-init.js
index 173a740e..a784ff3e 100644
--- a/js/kiri-init.js
+++ b/js/kiri-init.js
@@ -81,7 +81,6 @@ var gs_kiri_init = exports;
 
     function booleanSave() {
         let control = settings().controller;
-        let isCompact = control.compact;
         let isDark = control.dark;
         let isReload = false;
         control.expert = UI.expert.checked;
@@ -90,17 +89,11 @@ var gs_kiri_init = exports;
         control.freeLayout = UI.freeLayout.checked;
         control.alignTop = UI.alignTop.checked;
         control.reverseZoom = UI.reverseZoom.checked;
-        control.compact = UI.compact.checked;
         control.dark = UI.dark.checked;
         SPACE.view.setZoom(control.reverseZoom, control.zoomSpeed);
         platform.layout();
         platform.update_stock();
         API.conf.save();
-        // if compact mode changed, reload UI
-        if (isCompact !== control.compact) {
-            UC.setDefaults(isCompact);
-            isReload = true;
-        }
         // if dark mode changed, reload UI
         if (isDark !== control.dark) {
             isReload = true;
@@ -1071,7 +1064,6 @@ var gs_kiri_init = exports;
             container = $('container'),
             welcome = $('welcome'),
             controller = settings().controller,
-            compact = SETUP.compact || controller.compact,
             dark = controller.dark;
 
         WIN.addEventListener("resize", API.dialog.update);
@@ -1089,8 +1081,6 @@ var gs_kiri_init = exports;
         SPACE.platform.setRound(true);
         SPACE.useDefaultKeys(API.feature.on_key === undefined || API.feature.on_key_defaults);
 
-        UC.setCompact(compact);
-
         Object.assign(UI, {
             // from static HTML
             alert: {
@@ -1282,7 +1272,6 @@ var gs_kiri_init = exports;
 
             layout:        UC.newGroup(LANG.op_menu),
             expert:        UC.newBoolean(LANG.op_xprt_s, booleanSave, {title:LANG.op_xprt_l}),
-            compact:       UC.newBoolean(LANG.op_comp_s, booleanSave, {title:LANG.op_comp_l}),
             dark:          UC.newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l}),
             showOrigin:    UC.newBoolean(LANG.op_show_s, booleanSave, {title:LANG.op_show_l, modes:GCODE}),
             alignTop:      UC.newBoolean(LANG.op_alig_s, booleanSave, {title:LANG.op_alig_l, modes:CAM}),
@@ -1651,9 +1640,7 @@ var gs_kiri_init = exports;
             settings().device.bedHeight
         );
 
-        if (compact) {
-            UI.selection.classList.add('compact');
-        }
+        UI.selection.classList.add('compact');
 
         if (dark) {
             SPACE.platform.setGrid(25, 5, 0x999999, 0x333333);
@@ -1749,7 +1736,6 @@ var gs_kiri_init = exports;
         UI.autoLayout.checked = control.autoLayout;
         UI.alignTop.checked = control.alignTop;
         UI.reverseZoom.checked = control.reverseZoom;
-        UI.compact.checked = control.compact;
 
         // load script extensions
         if (SETUP.s) SETUP.s.forEach(function(lib) {
diff --git a/js/moto-ui.js b/js/moto-ui.js
index f325b7e2..6848820b 100644
--- a/js/moto-ui.js
+++ b/js/moto-ui.js
@@ -28,7 +28,6 @@ var gs_moto_ui = exports;
         DOC = SELF.document,
         prefix = "tab",
         NOMODE = "nomode",
-        compact = false,
         exitimer = undefined;
 
     SELF.$ = (SELF.$ || function (id) { return DOC.getElementById(id) } );
@@ -57,35 +56,17 @@ var gs_moto_ui = exports;
         newBlank: newBlank,
         newGroup: newGroup,
         setGroup: setGroup,
-        setCompact: setCompact,
-        setDefaults: setDefaults,
         hidePoppers: hidePoppers,
         checkpoint,
         restore
     };
 
-    function setDefaults(bool) {
-        Object.keys(localStorage).forEach(name => {
-            let namepre = `${prefix}-show-`;
-            if (name.indexOf(namepre) === 0) {
-                localStorage[name] = bool;
-            }
-        });
-    }
-
-    function setCompact(bool) {
-        compact = bool;
-        return this;
-    }
-
     function setMode(mode) {
-        if (compact) {
-            $('control-left').classList.add('compact');
-            $('control-right').classList.add('compact');
-            Object.keys(groupShow).forEach(group => {
-                updateGroupShow(group);
-            });
-        }
+        $('control-left').classList.add('compact');
+        $('control-right').classList.add('compact');
+        Object.keys(groupShow).forEach(group => {
+            updateGroupShow(group);
+        });
         letMode = mode;
         hasModes.forEach(function(div) {
             div.setMode(div._group && !groupShow[div._group] ? NOMODE : mode);
@@ -132,8 +113,8 @@ var gs_moto_ui = exports;
 
         let row = DOC.createElement('div'),
             a = DOC.createElement('a'),
-            dbkey = `${prefix}-show-${group}`,
-            popper = compact && !opt.nocompact;
+            dbkey = `beta-${prefix}-show-${group}`,
+            popper = !opt.nocompact;
 
         if (popper) {
             let pop = DOC.createElement('div');
@@ -185,9 +166,7 @@ var gs_moto_ui = exports;
     }
 
     function hidePoppers() {
-        if (compact) {
-            showGroup(undefined);
-        }
+        showGroup(undefined);
     }
 
     function showGroup(groupname) {
@@ -543,13 +522,13 @@ var gs_moto_ui = exports;
             t = DOC.createTextNode(label);
 
         b.onclick = function() {
-            if (compact) hidePoppers();
+            hidePoppers();
             if (action) action();
         };
 
         if (options) {
             if (options.class) b.classList.add(options.class);
-            if (compact && options.icon) {
+            if (options.icon) {
                 let d = DOC.createElement('div');
                 d.innerHTML = options.icon;
                 b.appendChild(d);