From b86edf20a5c8c35a02727c855382158daa426779 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Sun, 27 May 2018 15:44:15 +0200
Subject: [PATCH] Remove auto-toggling of navigation sidebar depending on width

---
 app/assets/javascripts/sidebar.js.erb        | 14 +-------------
 app/assets/javascripts/sidebar_toggle.js.erb | 12 +++++++++---
 config/initializers/constants.rb             |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/sidebar.js.erb b/app/assets/javascripts/sidebar.js.erb
index 511590708..1845e7989 100644
--- a/app/assets/javascripts/sidebar.js.erb
+++ b/app/assets/javascripts/sidebar.js.erb
@@ -227,27 +227,15 @@ function setupSidebarTree() {
 
 // Resize the sidebar to accomodate to the page size
 function resizeSidebarContents() {
-  var wrapper = $("#wrapper");
   var tree = $("#sidebar-wrapper .tree");
-  var toggled = true;
-  var navbar = $(".navbar-secondary");
 
+  // Set vertical scrollbar on navigation tree
   if (tree.length && tree.length == 1) {
     tree.css(
       "height",
       ($(window).height() - tree.position().top - 50) + "px"
     );
   }
-  // Automatic toggling of sidebar for smaller devices
-  if (toggled === null) {
-    if ($(window).width() < <%= Constants::SCREEN_WIDTH_LARGE %>) {
-      wrapper.addClass("toggled");
-      navbar.addClass("navbar-without-sidebar");
-    } else {
-      wrapper.removeClass("toggled");
-      navbar.removeClass("navbar-without-sidebar");
-    }
-  }
 }
 
 (function () {
diff --git a/app/assets/javascripts/sidebar_toggle.js.erb b/app/assets/javascripts/sidebar_toggle.js.erb
index 523485a36..757c5978b 100644
--- a/app/assets/javascripts/sidebar_toggle.js.erb
+++ b/app/assets/javascripts/sidebar_toggle.js.erb
@@ -12,6 +12,7 @@
       $('.navbar-secondary').css(
         { 'margin-left': '-280px', 'padding-left': '294px' }
       );
+      $('#sideBarButton').attr('data-shown', '');
     }
 
     function hide() {
@@ -25,23 +26,28 @@
         'margin-left': '0',
         'padding-left': '14px'
       });
+      $('#sideBarButton').removeAttr('data-shown');
     }
 
     function toggle() {
       var btn = $('#sideBarButton');
       if (btn.is('[data-shown]')) {
-        btn.removeAttr('data-shown');
         hide();
       } else {
-        btn.attr('data-shown', '');
         show();
       }
     }
 
+    function isShown() {
+      var btn = $('#sideBarButton');
+      return btn.is('[data-shown]');
+    }
+
     return Object.freeze({
       show: show,
       hide: hide,
-      toggle: toggle
+      toggle: toggle,
+      isShown: isShown
     })
   })();
 })(window);
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index e964b90bb..97fe865e4 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -96,7 +96,7 @@ class Constants
 
   # Screen width which is still suitable for sidebar to be shown, otherwise
   # hidden
-  SCREEN_WIDTH_LARGE = 928
+  SCREEN_WIDTH_LARGE = 768
 
   #=============================================================================
   # Styling