From e37666a571c22a9adcf3f29a126105e89c31dfdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <dev@4z2.de>
Date: Mon, 17 Apr 2017 18:03:56 +0200
Subject: [PATCH 1/7] better swipe handling

this makes the mobile UI less pleasant to use on Desktop :\
---
 index.html        |  8 +++----
 js/glowingbear.js | 56 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index b1146ae..2fd8bcd 100644
--- a/index.html
+++ b/index.html
@@ -280,7 +280,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
           </a>
         </div>
       </div>
-      <div id="sidebar" data-state="visible" ng-swipe-left="hideSidebar()" ng-swipe-disable-mouse class="vertical-line">
+      <div id="sidebar" data-state="visible" ng-swipe-left="swipeLeft($event)" class="vertical-line">
         <ul class="nav nav-pills nav-stacked" ng-class="{'indented': (predicate === 'serverSortKey'), 'showquickkeys': showQuickKeys, 'showjumpkeys': showJumpKeys}">
           <li class="bufferfilter">
             <form role="form">
@@ -310,8 +310,8 @@ npm run build-electron-{windows, darwin, linux}</pre>
           </li>
         </ul>
       </div>
-      <div id="bufferlines" class="favorite-font" ng-swipe-right="showSidebar()" ng-swipe-left="hideSidebar()" ng-swipe-disable-mouse ng-class="{'withnicklist': showNicklist}" when-scrolled="infiniteScroll()" imgur-drop>
-        <div id="nicklist" ng-if="showNicklist" ng-swipe-right="closeNick()" ng-swipe-disable-mouse class="vertical-line-left">
+      <div id="bufferlines" class="favorite-font" ng-swipe-right="swipeRight($event)" ng-swipe-left="swipeLeft($event)" ng-class="{'withnicklist': showNicklist}" when-scrolled="infiniteScroll()" imgur-drop>
+        <div id="nicklist" ng-if="showNicklist" ng-swipe-right="closeNick()" class="vertical-line-left">
           <ul class="nicklistgroup list-unstyled" ng-repeat="group in nicklist">
             <li ng-repeat="nick in group.nicks|orderBy:'name'">
               <a ng-click="openBuffer(nick.name)"><span ng-class="::nick.prefixClasses" ng-bind="::nick.prefix"></span><span ng-class="::nick.nameClasses" ng-bind="::nick.name"></span></a>
@@ -437,7 +437,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                   </div>
                 </form>
               </li>
-              <li>
+              <li ng-if="!isMobileUi()">
                 <form class="form-inline" role="form">
                   <div class="checkbox">
                     <label>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 48873ec..b7feb6a 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -20,7 +20,8 @@ weechat.config(['$compileProvider', function ($compileProvider) {
 }]);
 
 weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', '$log', 'models', 'bufferResume', 'connection', 'notifications', 'utils', 'settings',
-    function ($rootScope, $scope, $store, $timeout, $log, models, bufferResume, connection, notifications, utils, settings) {
+    function ($rootScope, $scope, $store, $timeout, $log, models, bufferResume, connection, notifications, utils, settings)
+{
 
     window.openBuffer = function(channel) {
         $scope.openBuffer(channel);
@@ -29,6 +30,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     $scope.command = '';
     $scope.themes = ['dark', 'light', 'black', 'dark-spacious', 'blue', 'base16-default', 'base16-light', 'base16-mocha', 'base16-ocean-dark', 'base16-solarized-dark', 'base16-solarized-light'];
+    $scope.swipeStatus = 1;
 
     // Initialise all our settings, this needs to include all settings
     // or else they won't be saved to the localStorage.
@@ -118,6 +120,9 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         }
     };
 
+    // expose
+    $rootScope.isMobileUi = function() { return utils.isMobileUi(); };
+
     if (typeof $scope.documentVisibilityChange !== "undefined") {
         document.addEventListener($scope.documentVisibilityChange, function() {
             if (!document[$scope.documentHidden]) {
@@ -168,6 +173,9 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             // Check if we should show nicklist or not
             $scope.showNicklist = $scope.updateShowNicklist();
         }
+        if ($scope.swipeStatus <= 0) {
+            $scope.swipeStatus = $scope.showNicklist ? -1 : 0;
+        }
 
         if (ab.requestedLines < $scope.lines_per_screen) {
             // buffer has not been loaded, but some lines may already be present if they arrived after we connected
@@ -323,6 +331,40 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         return document.getElementById('content').getAttribute('sidebar-state') === 'visible';
     };
 
+    $scope.swipeRight = function($event) {
+        var touch = $event instanceof TouchEvent;
+        // Depending on swipe state
+        if ($scope.swipeStatus === 1) {
+            /* do nothing */
+        } else if ($scope.swipeStatus === 0 && touch) {
+            $scope.showSidebar();
+        } else if ($scope.swipeStatus === -1) {
+            $scope.closeNick();
+        } else {
+            console.log("Weird swipe status:", $scope.swipeStatus);
+            $scope.swipeStatus = 0; // restore sanity
+            $scope.closeNick();
+            $scope.hideSidebar();
+        }
+    };
+
+    $rootScope.swipeLeft = function($event) {
+        var touch = $event instanceof TouchEvent;
+        // Depending on swipe state, ...
+        if ($scope.swipeStatus === 1 && touch) {
+            $scope.hideSidebar();
+        } else if ($scope.swipeStatus === 0) {
+            $scope.openNick();
+        } else if ($scope.swipeStatus === -1) {
+            /* do nothing */
+        } else {
+            console.log("Weird swipe status:", $scope.swipeStatus);
+            $scope.swipeStatus = 0; // restore sanity
+            $scope.closeNick();
+            $scope.hideSidebar();
+        }
+    };
+
     $scope.showSidebar = function() {
         document.getElementById('sidebar').setAttribute('data-state', 'visible');
         document.getElementById('content').setAttribute('sidebar-state', 'visible');
@@ -331,15 +373,24 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             _.each(document.getElementsByTagName('textarea'), function(elem) {
                 $timeout(function(){elem.blur();});
             });
+            // hide nicklist
+            settings.nonicklist = true;
         }
+        $scope.swipeStatus = 1;
     };
 
     $rootScope.hideSidebar = function() {
         if (utils.isMobileUi()) {
+            // make sure nicklist is hidden
+            settings.nonicklist = true;
             document.getElementById('sidebar').setAttribute('data-state', 'hidden');
             document.getElementById('content').setAttribute('sidebar-state', 'hidden');
         }
+        $scope.swipeStatus = 0;
     };
+    // fugly hack
+    $scope.hideSidebar = function() { $rootScope.hideSidebar(); };
+
     settings.addCallback('autoconnect', function(autoconnect) {
         if (autoconnect && !$rootScope.connected && !$rootScope.sslError && !$rootScope.securityError && !$rootScope.errorMessage) {
             $scope.connect();
@@ -718,6 +769,9 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     // Watch model and update show setting when it changes
     settings.addCallback('nonicklist', function() {
         $scope.showNicklist = $scope.updateShowNicklist();
+        if ($scope.swipeStatus <= 0) {
+            $scope.swipeStatus = $scope.showNicklist ? -1 : 0;
+        }
         // restore bottom view
         if ($rootScope.connected && $rootScope.bufferBottom) {
             $timeout(function(){

From 6b7b63961862cef9ac9da975c9f693ff5d8664d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <dev@4z2.de>
Date: Mon, 17 Apr 2017 18:04:03 +0200
Subject: [PATCH 2/7] Add an "always show nicklist" setting on mobile to
 replace "hide nicklist"

---
 index.html        | 10 ++++++++++
 js/glowingbear.js | 17 +++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 2fd8bcd..ea97999 100644
--- a/index.html
+++ b/index.html
@@ -437,6 +437,16 @@ npm run build-electron-{windows, darwin, linux}</pre>
                   </div>
                 </form>
               </li>
+              <li ng-if="isMobileUi()">
+                <form class="form-inline" role="form">
+                  <div class="checkbox">
+                    <label>
+                      <input type="checkbox" ng-model="settings.alwaysnicklist">
+                      Always show nicklist
+                    </label>
+                  </div>
+                </form>
+              </li>
               <li ng-if="!isMobileUi()">
                 <form class="form-inline" role="form">
                   <div class="checkbox">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index b7feb6a..33ecc5d 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -42,6 +42,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         'savepassword': false,
         'autoconnect': false,
         'nonicklist': utils.isMobileUi(),
+        'alwaysnicklist': false, // only significant on mobile
         'noembed': true,
         'onlyUnread': false,
         'hotlistsync': true,
@@ -173,7 +174,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             // Check if we should show nicklist or not
             $scope.showNicklist = $scope.updateShowNicklist();
         }
-        if ($scope.swipeStatus <= 0) {
+        if ($scope.swipeStatus <= 0 && !settings.alwaysnicklist) {
             $scope.swipeStatus = $scope.showNicklist ? -1 : 0;
         }
 
@@ -336,10 +337,10 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         // Depending on swipe state
         if ($scope.swipeStatus === 1) {
             /* do nothing */
-        } else if ($scope.swipeStatus === 0 && touch) {
-            $scope.showSidebar();
+        } else if ($scope.swipeStatus === 0) {
+            if (touch) $scope.showSidebar();
         } else if ($scope.swipeStatus === -1) {
-            $scope.closeNick();
+            if (!settings.alwaysnicklist) $scope.closeNick();
         } else {
             console.log("Weird swipe status:", $scope.swipeStatus);
             $scope.swipeStatus = 0; // restore sanity
@@ -351,8 +352,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     $rootScope.swipeLeft = function($event) {
         var touch = $event instanceof TouchEvent;
         // Depending on swipe state, ...
-        if ($scope.swipeStatus === 1 && touch) {
-            $scope.hideSidebar();
+        if ($scope.swipeStatus === 1) {
+            if (touch) $scope.hideSidebar();
         } else if ($scope.swipeStatus === 0) {
             $scope.openNick();
         } else if ($scope.swipeStatus === -1) {
@@ -769,7 +770,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     // Watch model and update show setting when it changes
     settings.addCallback('nonicklist', function() {
         $scope.showNicklist = $scope.updateShowNicklist();
-        if ($scope.swipeStatus <= 0) {
+        if ($scope.swipeStatus <= 0 && !settings.alwaysnicklist) {
             $scope.swipeStatus = $scope.showNicklist ? -1 : 0;
         }
         // restore bottom view
@@ -789,7 +790,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             return false;
         }
         // Check if option no nicklist is set
-        if (settings.nonicklist) {
+        if (settings.nonicklist && !settings.alwaysnicklist) {
             return false;
         }
         // Check if nicklist is empty

From 1c71ede145782de227c21a0dba29416ef93b0457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <dev@4z2.de>
Date: Mon, 17 Apr 2017 18:04:09 +0200
Subject: [PATCH 3/7] simplify touch detection logic

no swipes on desktop needed with the previous commit!
---
 index.html        |  6 +++---
 js/glowingbear.js | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index ea97999..41c3082 100644
--- a/index.html
+++ b/index.html
@@ -280,7 +280,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
           </a>
         </div>
       </div>
-      <div id="sidebar" data-state="visible" ng-swipe-left="swipeLeft($event)" class="vertical-line">
+      <div id="sidebar" data-state="visible" ng-swipe-left="swipeLeft()" ng-swipe-disable-mouse class="vertical-line">
         <ul class="nav nav-pills nav-stacked" ng-class="{'indented': (predicate === 'serverSortKey'), 'showquickkeys': showQuickKeys, 'showjumpkeys': showJumpKeys}">
           <li class="bufferfilter">
             <form role="form">
@@ -310,8 +310,8 @@ npm run build-electron-{windows, darwin, linux}</pre>
           </li>
         </ul>
       </div>
-      <div id="bufferlines" class="favorite-font" ng-swipe-right="swipeRight($event)" ng-swipe-left="swipeLeft($event)" ng-class="{'withnicklist': showNicklist}" when-scrolled="infiniteScroll()" imgur-drop>
-        <div id="nicklist" ng-if="showNicklist" ng-swipe-right="closeNick()" class="vertical-line-left">
+      <div id="bufferlines" class="favorite-font" ng-swipe-right="swipeRight()" ng-swipe-left="swipeLeft()" ng-swipe-disable-mouse ng-class="{'withnicklist': showNicklist}" when-scrolled="infiniteScroll()" imgur-drop>
+        <div id="nicklist" ng-if="showNicklist" ng-swipe-right="swipeRight()" ng-swipe-disable-mouse class="vertical-line-left">
           <ul class="nicklistgroup list-unstyled" ng-repeat="group in nicklist">
             <li ng-repeat="nick in group.nicks|orderBy:'name'">
               <a ng-click="openBuffer(nick.name)"><span ng-class="::nick.prefixClasses" ng-bind="::nick.prefix"></span><span ng-class="::nick.nameClasses" ng-bind="::nick.name"></span></a>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 33ecc5d..2d07b4c 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -332,13 +332,12 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         return document.getElementById('content').getAttribute('sidebar-state') === 'visible';
     };
 
-    $scope.swipeRight = function($event) {
-        var touch = $event instanceof TouchEvent;
+    $scope.swipeRight = function() {
         // Depending on swipe state
         if ($scope.swipeStatus === 1) {
             /* do nothing */
         } else if ($scope.swipeStatus === 0) {
-            if (touch) $scope.showSidebar();
+            $scope.showSidebar();
         } else if ($scope.swipeStatus === -1) {
             if (!settings.alwaysnicklist) $scope.closeNick();
         } else {
@@ -349,11 +348,10 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         }
     };
 
-    $rootScope.swipeLeft = function($event) {
-        var touch = $event instanceof TouchEvent;
+    $rootScope.swipeLeft = function() {
         // Depending on swipe state, ...
         if ($scope.swipeStatus === 1) {
-            if (touch) $scope.hideSidebar();
+            $scope.hideSidebar();
         } else if ($scope.swipeStatus === 0) {
             $scope.openNick();
         } else if ($scope.swipeStatus === -1) {

From f44b67489d23999152f66dcb723fc30a09d32b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <dev@4z2.de>
Date: Mon, 17 Apr 2017 18:04:13 +0200
Subject: [PATCH 4/7] Use CSS-based mobile detection

---
 index.html        | 4 ++--
 js/glowingbear.js | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 41c3082..c385abc 100644
--- a/index.html
+++ b/index.html
@@ -437,7 +437,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                   </div>
                 </form>
               </li>
-              <li ng-if="isMobileUi()">
+              <li class="mobile">
                 <form class="form-inline" role="form">
                   <div class="checkbox">
                     <label>
@@ -447,7 +447,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                   </div>
                 </form>
               </li>
-              <li ng-if="!isMobileUi()">
+              <li class="desktop">
                 <form class="form-inline" role="form">
                   <div class="checkbox">
                     <label>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 2d07b4c..2522c9a 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -121,9 +121,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         }
     };
 
-    // expose
-    $rootScope.isMobileUi = function() { return utils.isMobileUi(); };
-
     if (typeof $scope.documentVisibilityChange !== "undefined") {
         document.addEventListener($scope.documentVisibilityChange, function() {
             if (!document[$scope.documentHidden]) {

From f3e0e3e047b38fbe67ca0b83ae818ee5a775eafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <dev@4z2.de>
Date: Mon, 17 Apr 2017 18:04:21 +0200
Subject: [PATCH 5/7] Stop abusing "hide nicklist" setting to show/hide sidebar
 on mobile

---
 js/glowingbear.js | 45 +++++++++++++++------------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/js/glowingbear.js b/js/glowingbear.js
index 2522c9a..3a71fe5 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -334,13 +334,14 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         if ($scope.swipeStatus === 1) {
             /* do nothing */
         } else if ($scope.swipeStatus === 0) {
-            $scope.showSidebar();
+            $scope.showSidebar(); // updates swipe status to 1
         } else if ($scope.swipeStatus === -1) {
-            if (!settings.alwaysnicklist) $scope.closeNick();
+            $scope.swipeStatus = 0;
+            $scope.showNicklist = $scope.updateShowNicklist();
         } else {
             console.log("Weird swipe status:", $scope.swipeStatus);
             $scope.swipeStatus = 0; // restore sanity
-            $scope.closeNick();
+            $scope.showNicklist = $scope.updateShowNicklist();
             $scope.hideSidebar();
         }
     };
@@ -348,15 +349,16 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     $rootScope.swipeLeft = function() {
         // Depending on swipe state, ...
         if ($scope.swipeStatus === 1) {
-            $scope.hideSidebar();
+            $scope.hideSidebar(); // updates swipe status to 0
         } else if ($scope.swipeStatus === 0) {
-            $scope.openNick();
+            $scope.swipeStatus = -1;
+            $scope.showNicklist = $scope.updateShowNicklist();
         } else if ($scope.swipeStatus === -1) {
             /* do nothing */
         } else {
             console.log("Weird swipe status:", $scope.swipeStatus);
             $scope.swipeStatus = 0; // restore sanity
-            $scope.closeNick();
+            $scope.showNicklist = $scope.updateShowNicklist();
             $scope.hideSidebar();
         }
     };
@@ -369,8 +371,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             _.each(document.getElementsByTagName('textarea'), function(elem) {
                 $timeout(function(){elem.blur();});
             });
-            // hide nicklist
-            settings.nonicklist = true;
         }
         $scope.swipeStatus = 1;
     };
@@ -378,14 +378,11 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     $rootScope.hideSidebar = function() {
         if (utils.isMobileUi()) {
             // make sure nicklist is hidden
-            settings.nonicklist = true;
             document.getElementById('sidebar').setAttribute('data-state', 'hidden');
             document.getElementById('content').setAttribute('sidebar-state', 'hidden');
         }
         $scope.swipeStatus = 0;
     };
-    // fugly hack
-    $scope.hideSidebar = function() { $rootScope.hideSidebar(); };
 
     settings.addCallback('autoconnect', function(autoconnect) {
         if (autoconnect && !$rootScope.connected && !$rootScope.sslError && !$rootScope.securityError && !$rootScope.errorMessage) {
@@ -404,23 +401,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         }
     };
 
-    // Open and close panels while on mobile devices through swiping
-    $scope.openNick = function() {
-        if (utils.isMobileUi()) {
-            if (settings.nonicklist) {
-                settings.nonicklist = false;
-            }
-        }
-    };
-
-    $scope.closeNick = function() {
-        if (utils.isMobileUi()) {
-            if (!settings.nonicklist) {
-                settings.nonicklist = true;
-            }
-        }
-    };
-
     // Watch model and update channel sorting when it changes
     var set_filter_predicate = function(orderbyserver) {
         if ($rootScope.showJumpKeys) {
@@ -588,6 +568,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             // Wrap in a condition so we save ourselves the $apply if nothing changes (50ms or more)
             if ($scope.wasMobileUi && !utils.isMobileUi()) {
                 $scope.showSidebar();
+                $scope.showNicklist = $scope.updateShowNicklist();
             }
             $scope.wasMobileUi = utils.isMobileUi();
             $scope.calculateNumLines();
@@ -784,14 +765,18 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         if (!ab) {
             return false;
         }
-        // Check if option no nicklist is set
-        if (settings.nonicklist && !settings.alwaysnicklist) {
+        // Check if option no nicklist is set (ignored on mobile)
+        if (!utils.isMobileUi() && settings.nonicklist && !settings.alwaysnicklist) {
             return false;
         }
         // Check if nicklist is empty
         if (ab.isNicklistEmpty()) {
             return false;
         }
+        // Check whether to show nicklist on mobile
+        if (utils.isMobileUi() && !settings.alwaysnicklist && $scope.swipeStatus !== -1) {
+            return false;
+        }
         return true;
     };
 

From 9c28ec40557c24e799a02abce2c51a2fb8de8ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <dev@4z2.de>
Date: Mon, 17 Apr 2017 18:04:24 +0200
Subject: [PATCH 6/7] Document, simplify, and improve swipe logic

---
 js/glowingbear.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/js/glowingbear.js b/js/glowingbear.js
index 3a71fe5..82d6998 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -30,6 +30,11 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     $scope.command = '';
     $scope.themes = ['dark', 'light', 'black', 'dark-spacious', 'blue', 'base16-default', 'base16-light', 'base16-mocha', 'base16-ocean-dark', 'base16-solarized-dark', 'base16-solarized-light'];
+
+    // Current swipe status. Values:
+    // +1: bufferlist open, nicklist closed
+    //  0: bufferlist closed, nicklist closed
+    // -1: bufferlist closed, nicklist open
     $scope.swipeStatus = 1;
 
     // Initialise all our settings, this needs to include all settings
@@ -171,9 +176,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             // Check if we should show nicklist or not
             $scope.showNicklist = $scope.updateShowNicklist();
         }
-        if ($scope.swipeStatus <= 0 && !settings.alwaysnicklist) {
-            $scope.swipeStatus = $scope.showNicklist ? -1 : 0;
-        }
 
         if (ab.requestedLines < $scope.lines_per_screen) {
             // buffer has not been loaded, but some lines may already be present if they arrived after we connected
@@ -336,6 +338,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         } else if ($scope.swipeStatus === 0) {
             $scope.showSidebar(); // updates swipe status to 1
         } else if ($scope.swipeStatus === -1) {
+            // hide nicklist
             $scope.swipeStatus = 0;
             $scope.showNicklist = $scope.updateShowNicklist();
         } else {
@@ -351,6 +354,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         if ($scope.swipeStatus === 1) {
             $scope.hideSidebar(); // updates swipe status to 0
         } else if ($scope.swipeStatus === 0) {
+            // show nicklist
             $scope.swipeStatus = -1;
             $scope.showNicklist = $scope.updateShowNicklist();
         } else if ($scope.swipeStatus === -1) {
@@ -746,9 +750,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     // Watch model and update show setting when it changes
     settings.addCallback('nonicklist', function() {
         $scope.showNicklist = $scope.updateShowNicklist();
-        if ($scope.swipeStatus <= 0 && !settings.alwaysnicklist) {
-            $scope.swipeStatus = $scope.showNicklist ? -1 : 0;
-        }
         // restore bottom view
         if ($rootScope.connected && $rootScope.bufferBottom) {
             $timeout(function(){
@@ -756,6 +757,9 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             }, 500);
         }
     });
+    settings.addCallback('alwaysnicklist', function() {
+        $scope.showNicklist = $scope.updateShowNicklist();
+    });
     $scope.showNicklist = false;
     // Utility function that template can use to check if nicklist should
     // be displayed for current buffer or not

From 89bfac964e94c6b2b0a7235af960b47ca33c97cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <dev@4z2.de>
Date: Mon, 17 Apr 2017 18:04:30 +0200
Subject: [PATCH 7/7] Simplify updateShowNicklist

---
 js/glowingbear.js | 53 +++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/js/glowingbear.js b/js/glowingbear.js
index 82d6998..227f32d 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -168,13 +168,13 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         // Send a request for the nicklist if it hasn't been loaded yet
         if (!ab.nicklistRequested()) {
             connection.requestNicklist(ab.id, function() {
-                $scope.showNicklist = $scope.updateShowNicklist();
+                $scope.updateShowNicklist();
                 // Scroll after nicklist has been loaded, as it may break long lines
                 $rootScope.scrollWithBuffer(true);
             });
         } else {
             // Check if we should show nicklist or not
-            $scope.showNicklist = $scope.updateShowNicklist();
+            $scope.updateShowNicklist();
         }
 
         if (ab.requestedLines < $scope.lines_per_screen) {
@@ -340,11 +340,11 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         } else if ($scope.swipeStatus === -1) {
             // hide nicklist
             $scope.swipeStatus = 0;
-            $scope.showNicklist = $scope.updateShowNicklist();
+            $scope.updateShowNicklist();
         } else {
             console.log("Weird swipe status:", $scope.swipeStatus);
             $scope.swipeStatus = 0; // restore sanity
-            $scope.showNicklist = $scope.updateShowNicklist();
+            $scope.updateShowNicklist();
             $scope.hideSidebar();
         }
     };
@@ -356,13 +356,13 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         } else if ($scope.swipeStatus === 0) {
             // show nicklist
             $scope.swipeStatus = -1;
-            $scope.showNicklist = $scope.updateShowNicklist();
+            $scope.updateShowNicklist();
         } else if ($scope.swipeStatus === -1) {
             /* do nothing */
         } else {
             console.log("Weird swipe status:", $scope.swipeStatus);
             $scope.swipeStatus = 0; // restore sanity
-            $scope.showNicklist = $scope.updateShowNicklist();
+            $scope.updateShowNicklist();
             $scope.hideSidebar();
         }
     };
@@ -572,7 +572,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             // Wrap in a condition so we save ourselves the $apply if nothing changes (50ms or more)
             if ($scope.wasMobileUi && !utils.isMobileUi()) {
                 $scope.showSidebar();
-                $scope.showNicklist = $scope.updateShowNicklist();
+                $scope.updateShowNicklist();
             }
             $scope.wasMobileUi = utils.isMobileUi();
             $scope.calculateNumLines();
@@ -749,7 +749,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     // Watch model and update show setting when it changes
     settings.addCallback('nonicklist', function() {
-        $scope.showNicklist = $scope.updateShowNicklist();
+        $scope.updateShowNicklist();
         // restore bottom view
         if ($rootScope.connected && $rootScope.bufferBottom) {
             $timeout(function(){
@@ -758,30 +758,29 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         }
     });
     settings.addCallback('alwaysnicklist', function() {
-        $scope.showNicklist = $scope.updateShowNicklist();
+        $scope.updateShowNicklist();
     });
     $scope.showNicklist = false;
     // Utility function that template can use to check if nicklist should
     // be displayed for current buffer or not
-    // is called on buffer switch
+    // is called on buffer switch and certain swipe actions
     $scope.updateShowNicklist = function() {
-        var ab = models.getActiveBuffer();
-        if (!ab) {
-            return false;
-        }
-        // Check if option no nicklist is set (ignored on mobile)
-        if (!utils.isMobileUi() && settings.nonicklist && !settings.alwaysnicklist) {
-            return false;
-        }
-        // Check if nicklist is empty
-        if (ab.isNicklistEmpty()) {
-            return false;
-        }
-        // Check whether to show nicklist on mobile
-        if (utils.isMobileUi() && !settings.alwaysnicklist && $scope.swipeStatus !== -1) {
-            return false;
-        }
-        return true;
+        $scope.showNicklist = (function() {
+            var ab = models.getActiveBuffer();
+            // Check whether buffer exists and nicklist is non-empty
+            if (!ab || ab.isNicklistEmpty()) {
+                return false;
+            }
+            // Check if nicklist is disabled in settings (ignored on mobile)
+            if (!utils.isMobileUi() && settings.nonicklist) {
+                return false;
+            }
+            // mobile: hide nicklist unless overriden by setting or swipe action
+            if (utils.isMobileUi() && !settings.alwaysnicklist && $scope.swipeStatus !== -1) {
+                return false;
+            }
+            return true;
+        })();
     };
 
 //XXX not sure whether this belongs here