From 811e76d4431908cb460ee700a33a2cce94268718 Mon Sep 17 00:00:00 2001
From: Tobias Theuer <git@hurtsmybra.in>
Date: Tue, 14 Mar 2017 23:00:01 +0100
Subject: [PATCH 1/8] Jump to any buffer (up to 99) with Alt+J followed by 2
 digits.

---
 css/glowingbear.css | 27 ++++++++++++++++++
 index.html          |  3 +-
 js/filters.js       |  2 ++
 js/inputbar.js      | 67 +++++++++++++++++++++++++++++++++++++++------
 4 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/css/glowingbear.css b/css/glowingbear.css
index 60a7e0b..2b2503b 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -466,6 +466,33 @@ div.colourbox {
     align: right;
 }
 
+#sidebar .showjumpkeys .buffer .buffer-jump-key {
+    transition: all ease-in-out 0.5s;
+    -webkit-transition: all ease-in-out 0.5s;
+    transition-delay: 0.2s;
+    -webkit-transition-delay: 0.2s;
+    opacity: 0.7;
+    margin-left: -1.2em;
+    margin-right: 0.1em;
+}
+#sidebar .buffer .buffer-jump-key {
+    margin-left: -1.2em;
+    margin-right: -0.2em;
+    font-size: smaller;
+    transition: all ease-in-out 0.5s;
+    -webkit-transition: all ease-in-out 0.5s;
+    opacity: 0;
+    text-shadow: -1px 0px 4px rgba(255, 255, 255, 0.4),
+    0px -1px 4px rgba(255, 255, 255, 0.4),
+    1px 0px 4px rgba(255, 255, 255, 0.4),
+    0px 1px 4px rgba(255, 255, 255, 0.4);
+    vertical-align: baseline;
+    display: inline-block;
+    width: 1em;
+    align: right;
+}
+
+
 .gb-modal {
     z-index: 1000;
     height: 100%;
diff --git a/index.html b/index.html
index 4e3f262..9124131 100644
--- a/index.html
+++ b/index.html
@@ -262,7 +262,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
         </div>
       </div>
       <div id="sidebar" data-state="visible" ng-swipe-left="hideSidebar()" ng-swipe-disable-mouse class="vertical-line">
-        <ul class="nav nav-pills nav-stacked" ng-class="{'indented': (predicate === 'serverSortKey'), 'showquickkeys': showQuickKeys}">
+        <ul class="nav nav-pills nav-stacked" ng-class="{'indented': (predicate === 'serverSortKey'), 'showquickkeys': showQuickKeys, 'showjumpkeys': showJumpKeys}">
           <li class="bufferfilter">
             <form role="form">
               <input class="form-control favorite-font" type="text" id="bufferFilter" ng-model="search" ng-keydown="handleSearchBoxKey($event)" placeholder="Search" autocomplete="off">
@@ -282,6 +282,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
             <a ng-click="setActiveBuffer(buffer.id)" title="{{ buffer.fullName }}" href="#">
               <span class="badge pull-right" ng-class="{'danger': buffer.notification}" ng-bind="buffer.notification || buffer.unread"></span>
               <span class="buffer-quick-key">{{ buffer.$quickKey }}</span>
+              <span class="buffer-jump-key">{{ buffer.$jumpKey }}</span>
               <span class="buffername">{{ buffer.trimmedName || buffer.fullName }}</span>
             </a>
           </li>
diff --git a/js/filters.js b/js/filters.js
index 37ff9b9..6598258 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -141,6 +141,7 @@ weechat.filter('getBufferQuickKeys', function () {
         if (($scope.search !== undefined && $scope.search.length) || $scope.onlyUnread) {
             obj.forEach(function(buf, idx) {
                 buf.$quickKey = idx < 10 ? (idx + 1) % 10 : '';
+                buf.$jumpKey = idx + 1;
             });
         } else {
             _.map(obj, function(buffer, idx) {
@@ -151,6 +152,7 @@ weechat.filter('getBufferQuickKeys', function () {
                 return left[0] - right[0] || left[1] - right[1];
             }).forEach(function(info, keyIdx) {
                 obj[ info[2] ].$quickKey = keyIdx < 10 ? (keyIdx + 1) % 10 : '';
+                obj[ info[2] ].$jumpKey = keyIdx + 1;
             });
         }
         return obj;
diff --git a/js/inputbar.js b/js/inputbar.js
index 17ef481..cbe2e0c 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -246,17 +246,20 @@ weechat.directive('inputBar', function() {
                 var tmpIterCandidate = $scope.iterCandidate;
                 $scope.iterCandidate = null;
 
-                // Left Alt+[0-9] -> jump to buffer
-                if ($event.altKey && !$event.ctrlKey && (code > 47 && code < 58)) {
-                    if (code === 48) {
-                        code = 58;
-                    }
-                    var bufferNumber = code - 48 - 1 ;
+                var bufferNumber;
+                var sortedBuffers;
+                var filteredBufferNum;
+                var activeBufferId;
 
-                    var activeBufferId;
+                // if Alt+J was pressed last, we expect two numbers now
+                if ($rootScope.showJumpKeys && !$event.altKey && (code > 47 && code < 58) && $scope.jumpDecimal === undefined) {
+                    $scope.jumpDecimal = code - 48;
+                    $event.preventDefault();
+                } else if ($rootScope.showJumpKeys && !$event.altKey && (code > 47 && code < 58) && $scope.jumpDecimal !== undefined) {
+                    bufferNumber = ($scope.jumpDecimal * 10) + (code - 48) - 1;
                     // quick select filtered entries
                     if (($scope.$parent.search.length || $scope.$parent.onlyUnread) && $scope.$parent.filteredBuffers.length) {
-                        var filteredBufferNum = $scope.$parent.filteredBuffers[bufferNumber];
+                        filteredBufferNum = $scope.$parent.filteredBuffers[bufferNumber];
                         if (filteredBufferNum !== undefined) {
                             activeBufferId = [filteredBufferNum.number, filteredBufferNum.id];
                         }
@@ -264,7 +267,44 @@ weechat.directive('inputBar', function() {
                         // Map the buffers to only their numbers and IDs so we don't have to
                         // copy the entire (possibly very large) buffer object, and then sort
                         // the buffers according to their WeeChat number
-                        var sortedBuffers = _.map(models.getBuffers(), function(buffer) {
+                        sortedBuffers = _.map(models.getBuffers(), function(buffer) {
+                            return [buffer.number, buffer.id];
+                        }).sort(function(left, right) {
+                            // By default, Array.prototype.sort() sorts alphabetically.
+                            // Pass an ordering function to sort by first element.
+                            return left[0] - right[0];
+                        });
+                        activeBufferId = sortedBuffers[bufferNumber];
+                    }
+                    if (activeBufferId) {
+                        $scope.$parent.setActiveBuffer(activeBufferId[1]);
+                    }
+                    $event.preventDefault();
+                    $rootScope.showJumpKeys = false;
+                    $scope.jumpDecimal = undefined;
+                } else {
+                    $rootScope.showJumpKeys = false;
+                    $scope.jumpDecimal = undefined;
+                }
+
+                // Left Alt+[0-9] -> jump to buffer
+                if ($event.altKey && !$event.ctrlKey && (code > 47 && code < 58)) {
+                    if (code === 48) {
+                        code = 58;
+                    }
+                    bufferNumber = code - 48 - 1 ;
+
+                    // quick select filtered entries
+                    if (($scope.$parent.search.length || $scope.$parent.onlyUnread) && $scope.$parent.filteredBuffers.length) {
+                        filteredBufferNum = $scope.$parent.filteredBuffers[bufferNumber];
+                        if (filteredBufferNum !== undefined) {
+                            activeBufferId = [filteredBufferNum.number, filteredBufferNum.id];
+                        }
+                    } else {
+                        // Map the buffers to only their numbers and IDs so we don't have to
+                        // copy the entire (possibly very large) buffer object, and then sort
+                        // the buffers according to their WeeChat number
+                        sortedBuffers = _.map(models.getBuffers(), function(buffer) {
                             return [buffer.number, buffer.id];
                         }).sort(function(left, right) {
                             // By default, Array.prototype.sort() sorts alphabetically.
@@ -371,6 +411,15 @@ weechat.directive('inputBar', function() {
                     connection.sendHotlistClearAll();
                 }
 
+                // Alt+J -> Jump to buffer
+                if ($event.altKey && (code === 106 || code === 74)) {
+                    $event.preventDefault();
+
+                    $rootScope.showJumpKeys = true;
+
+                    return true;
+                }
+
                 var caretPos;
 
                 // Arrow up -> go up in history

From 833a2a8c0fd8f0b24e77d22406a2373771c2432e Mon Sep 17 00:00:00 2001
From: Tobias Theuer <git@hurtsmybra.in>
Date: Wed, 15 Mar 2017 13:21:29 +0100
Subject: [PATCH 2/8] Improved timing. Made code more readable.

---
 css/glowingbear.css | 12 ++++----
 js/inputbar.js      | 71 ++++++++++++++++++++++++---------------------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/css/glowingbear.css b/css/glowingbear.css
index 2b2503b..65fd16d 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -467,10 +467,10 @@ div.colourbox {
 }
 
 #sidebar .showjumpkeys .buffer .buffer-jump-key {
-    transition: all ease-in-out 0.5s;
-    -webkit-transition: all ease-in-out 0.5s;
-    transition-delay: 0.2s;
-    -webkit-transition-delay: 0.2s;
+    transition: all ease-in-out 0.2s;
+    -webkit-transition: all ease-in-out 0.2s;
+    transition-delay: 0s;
+    -webkit-transition-delay: 0s;
     opacity: 0.7;
     margin-left: -1.2em;
     margin-right: 0.1em;
@@ -479,8 +479,8 @@ div.colourbox {
     margin-left: -1.2em;
     margin-right: -0.2em;
     font-size: smaller;
-    transition: all ease-in-out 0.5s;
-    -webkit-transition: all ease-in-out 0.5s;
+    transition: all ease-in-out 0.2s;
+    -webkit-transition: all ease-in-out 0.2s;
     opacity: 0;
     text-shadow: -1px 0px 4px rgba(255, 255, 255, 0.4),
     0px -1px 4px rgba(255, 255, 255, 0.4),
diff --git a/js/inputbar.js b/js/inputbar.js
index cbe2e0c..e44a04c 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -251,40 +251,47 @@ weechat.directive('inputBar', function() {
                 var filteredBufferNum;
                 var activeBufferId;
 
-                // if Alt+J was pressed last, we expect two numbers now
-                if ($rootScope.showJumpKeys && !$event.altKey && (code > 47 && code < 58) && $scope.jumpDecimal === undefined) {
-                    $scope.jumpDecimal = code - 48;
-                    $event.preventDefault();
-                } else if ($rootScope.showJumpKeys && !$event.altKey && (code > 47 && code < 58) && $scope.jumpDecimal !== undefined) {
-                    bufferNumber = ($scope.jumpDecimal * 10) + (code - 48) - 1;
-                    // quick select filtered entries
-                    if (($scope.$parent.search.length || $scope.$parent.onlyUnread) && $scope.$parent.filteredBuffers.length) {
-                        filteredBufferNum = $scope.$parent.filteredBuffers[bufferNumber];
-                        if (filteredBufferNum !== undefined) {
-                            activeBufferId = [filteredBufferNum.number, filteredBufferNum.id];
+                // if Alt+J was pressed last...
+                if ($rootScope.showJumpKeys) {
+                    // ... we expect two digits now
+                    if (!$event.altKey && (code > 47 && code < 58)) {
+                        // first digit
+                        if ($scope.jumpDecimal === undefined) {
+                            $scope.jumpDecimal = code - 48;
+                            $event.preventDefault();
+                        // second digit
+                        } else {
+                            bufferNumber = ($scope.jumpDecimal * 10) + (code - 48) - 1;
+                            // quick select filtered entries
+                            if (($scope.$parent.search.length || $scope.$parent.onlyUnread) && $scope.$parent.filteredBuffers.length) {
+                                filteredBufferNum = $scope.$parent.filteredBuffers[bufferNumber];
+                                if (filteredBufferNum !== undefined) {
+                                    activeBufferId = [filteredBufferNum.number, filteredBufferNum.id];
+                                }
+                            } else {
+                                // Map the buffers to only their numbers and IDs so we don't have to
+                                // copy the entire (possibly very large) buffer object, and then sort
+                                // the buffers according to their WeeChat number
+                                sortedBuffers = _.map(models.getBuffers(), function (buffer) {
+                                    return [buffer.number, buffer.id];
+                                }).sort(function (left, right) {
+                                    // By default, Array.prototype.sort() sorts alphabetically.
+                                    // Pass an ordering function to sort by first element.
+                                    return left[0] - right[0];
+                                });
+                                activeBufferId = sortedBuffers[bufferNumber];
+                            }
+                            if (activeBufferId) {
+                                $scope.$parent.setActiveBuffer(activeBufferId[1]);
+                            }
+                            $event.preventDefault();
+                            $rootScope.showJumpKeys = false;
+                            $scope.jumpDecimal = undefined;
                         }
                     } else {
-                        // Map the buffers to only their numbers and IDs so we don't have to
-                        // copy the entire (possibly very large) buffer object, and then sort
-                        // the buffers according to their WeeChat number
-                        sortedBuffers = _.map(models.getBuffers(), function(buffer) {
-                            return [buffer.number, buffer.id];
-                        }).sort(function(left, right) {
-                            // By default, Array.prototype.sort() sorts alphabetically.
-                            // Pass an ordering function to sort by first element.
-                            return left[0] - right[0];
-                        });
-                        activeBufferId = sortedBuffers[bufferNumber];
+                        $rootScope.showJumpKeys = false;
+                        $scope.jumpDecimal = undefined;
                     }
-                    if (activeBufferId) {
-                        $scope.$parent.setActiveBuffer(activeBufferId[1]);
-                    }
-                    $event.preventDefault();
-                    $rootScope.showJumpKeys = false;
-                    $scope.jumpDecimal = undefined;
-                } else {
-                    $rootScope.showJumpKeys = false;
-                    $scope.jumpDecimal = undefined;
                 }
 
                 // Left Alt+[0-9] -> jump to buffer
@@ -414,9 +421,7 @@ weechat.directive('inputBar', function() {
                 // Alt+J -> Jump to buffer
                 if ($event.altKey && (code === 106 || code === 74)) {
                     $event.preventDefault();
-
                     $rootScope.showJumpKeys = true;
-
                     return true;
                 }
 

From e5b8f8fffe5c5b1a7a92f8398d7de51108625fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?=
 <lorenz-dev@lgh-alumni.de>
Date: Sat, 18 Mar 2017 16:20:08 +0100
Subject: [PATCH 3/8] Force jump keys to double digits

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 9124131..542ae67 100644
--- a/index.html
+++ b/index.html
@@ -282,7 +282,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
             <a ng-click="setActiveBuffer(buffer.id)" title="{{ buffer.fullName }}" href="#">
               <span class="badge pull-right" ng-class="{'danger': buffer.notification}" ng-bind="buffer.notification || buffer.unread"></span>
               <span class="buffer-quick-key">{{ buffer.$quickKey }}</span>
-              <span class="buffer-jump-key">{{ buffer.$jumpKey }}</span>
+              <span class="buffer-jump-key">{{ ("0" + buffer.$jumpKey).slice(-2) }}</span>
               <span class="buffername">{{ buffer.trimmedName || buffer.fullName }}</span>
             </a>
           </li>

From cdd88baa629dce831b63c486facc7557dc408cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?=
 <lorenz-dev@lgh-alumni.de>
Date: Sat, 18 Mar 2017 16:23:12 +0100
Subject: [PATCH 4/8] Add "Jump:" label to search box when jumping

---
 css/glowingbear.css | 16 +++++++++++++++-
 index.html          |  5 ++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/css/glowingbear.css b/css/glowingbear.css
index 65fd16d..51a7236 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -73,10 +73,24 @@ td.message {
     border-bottom: 2px solid #555;
 }
 
-.input-group-addon, .input-group-btn {
+.input-group-btn {
     vertical-align: top;
 }
 
+.input-group-addon {
+    background: none;
+    border: none;
+    color: #ccc;
+}
+
+.buffer-jump {
+   display: none;
+}
+
+.showjumpkeys .buffer-jump {
+   display: table-cell;
+}
+
 .footer button {
     border-radius: 0;
 }
diff --git a/index.html b/index.html
index 542ae67..d45d339 100644
--- a/index.html
+++ b/index.html
@@ -265,7 +265,10 @@ npm run build-electron-{windows, darwin, linux}</pre>
         <ul class="nav nav-pills nav-stacked" ng-class="{'indented': (predicate === 'serverSortKey'), 'showquickkeys': showQuickKeys, 'showjumpkeys': showJumpKeys}">
           <li class="bufferfilter">
             <form role="form">
-              <input class="form-control favorite-font" type="text" id="bufferFilter" ng-model="search" ng-keydown="handleSearchBoxKey($event)" placeholder="Search" autocomplete="off">
+              <div class="input-group">
+                <span class="input-group-addon buffer-jump" id="jump-addon">Jump:</span>
+                <input class="form-control favorite-font" type="text" id="bufferFilter" ng-model="search" ng-keydown="handleSearchBoxKey($event)" placeholder="Search" autocomplete="off" aria-describedby="jump-addon">
+              </div>
             </form>
           </li>
           <li class="buffer" ng-class="{'active': buffer.active,

From d9346f5f3e3c2f37df75239cd80af0c0509655c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?=
 <lorenz-dev@lgh-alumni.de>
Date: Sat, 18 Mar 2017 16:31:05 +0100
Subject: [PATCH 5/8] simplify buffer jumping logic

---
 js/inputbar.js | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/js/inputbar.js b/js/inputbar.js
index e44a04c..ac22357 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -261,29 +261,9 @@ weechat.directive('inputBar', function() {
                             $event.preventDefault();
                         // second digit
                         } else {
-                            bufferNumber = ($scope.jumpDecimal * 10) + (code - 48) - 1;
-                            // quick select filtered entries
-                            if (($scope.$parent.search.length || $scope.$parent.onlyUnread) && $scope.$parent.filteredBuffers.length) {
-                                filteredBufferNum = $scope.$parent.filteredBuffers[bufferNumber];
-                                if (filteredBufferNum !== undefined) {
-                                    activeBufferId = [filteredBufferNum.number, filteredBufferNum.id];
-                                }
-                            } else {
-                                // Map the buffers to only their numbers and IDs so we don't have to
-                                // copy the entire (possibly very large) buffer object, and then sort
-                                // the buffers according to their WeeChat number
-                                sortedBuffers = _.map(models.getBuffers(), function (buffer) {
-                                    return [buffer.number, buffer.id];
-                                }).sort(function (left, right) {
-                                    // By default, Array.prototype.sort() sorts alphabetically.
-                                    // Pass an ordering function to sort by first element.
-                                    return left[0] - right[0];
-                                });
-                                activeBufferId = sortedBuffers[bufferNumber];
-                            }
-                            if (activeBufferId) {
-                                $scope.$parent.setActiveBuffer(activeBufferId[1]);
-                            }
+                            bufferNumber = ($rootScope.jumpDecimal * 10) + (code - 48);
+                            $scope.$parent.setActiveBuffer(bufferNumber, '$jumpKey');
+
                             $event.preventDefault();
                             $rootScope.showJumpKeys = false;
                             $scope.jumpDecimal = undefined;

From 22cb962e63e4e356c58a8c19a9aafd9c28c600a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?=
 <lorenz-dev@lgh-alumni.de>
Date: Sat, 18 Mar 2017 16:31:55 +0100
Subject: [PATCH 6/8] jumpkeys: filter on entry of first digit

not quite sure whether I like changing the sort order
---
 index.html        |  2 +-
 js/filters.js     |  7 +++++--
 js/glowingbear.js | 36 +++++++++++++++++++++++++++++++++---
 js/inputbar.js    | 22 +++++++++++++++-------
 4 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index d45d339..8f7f5fe 100644
--- a/index.html
+++ b/index.html
@@ -281,7 +281,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                                         'channel_plus': buffer.prefix === '+',
                                         'channel_ampersand': buffer.prefix === '&',
                                         'private': buffer.type === 'private'}"
-              ng-repeat="(key, buffer) in (filteredBuffers = (getBuffers() | toArray:'withidx' | filter:{fullName:search} | filter:hasUnread | orderBy:predicate | getBufferQuickKeys:this))">
+              ng-repeat="(key, buffer) in (filteredBuffers = (getBuffers() | toArray:'withidx' | filter:bufferlistfilter | filter:hasUnread | orderBy:predicate | getBufferQuickKeys:this))">
             <a ng-click="setActiveBuffer(buffer.id)" title="{{ buffer.fullName }}" href="#">
               <span class="badge pull-right" ng-class="{'danger': buffer.notification}" ng-bind="buffer.notification || buffer.unread"></span>
               <span class="buffer-quick-key">{{ buffer.$quickKey }}</span>
diff --git a/js/filters.js b/js/filters.js
index 6598258..3e98d6a 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -141,7 +141,6 @@ weechat.filter('getBufferQuickKeys', function () {
         if (($scope.search !== undefined && $scope.search.length) || $scope.onlyUnread) {
             obj.forEach(function(buf, idx) {
                 buf.$quickKey = idx < 10 ? (idx + 1) % 10 : '';
-                buf.$jumpKey = idx + 1;
             });
         } else {
             _.map(obj, function(buffer, idx) {
@@ -152,7 +151,11 @@ weechat.filter('getBufferQuickKeys', function () {
                 return left[0] - right[0] || left[1] - right[1];
             }).forEach(function(info, keyIdx) {
                 obj[ info[2] ].$quickKey = keyIdx < 10 ? (keyIdx + 1) % 10 : '';
-                obj[ info[2] ].$jumpKey = keyIdx + 1;
+                // Don't update jump key upon filtering
+                if (obj[ info[2] ].$jumpKey === undefined) {
+                    // Only assign jump keys up to 99
+                    obj[ info[2] ].$jumpKey = (keyIdx < 99) ? keyIdx + 1 : '';
+                }
             });
         }
         return obj;
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 38aea50..305817a 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -359,9 +359,20 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     };
 
     // Watch model and update channel sorting when it changes
-    settings.addCallback('orderbyserver', function(orderbyserver) {
-        $rootScope.predicate = orderbyserver ? 'serverSortKey' : 'number';
-    });
+    var set_filter_predicate = function(orderbyserver) {
+        if ($rootScope.showJumpKeys) {
+            $rootScope.predicate = '$jumpKey';
+        } else if (orderbyserver) {
+            $rootScope.predicate = 'serverSortKey';
+        } else {
+            $rootScope.predicate = 'number';
+        }
+    };
+    settings.addCallback('orderbyserver', set_filter_predicate);
+    // convenience wrapper for jump keys
+    $rootScope.refresh_filter_predicate = function() {
+        set_filter_predicate(settings.orderbyserver);
+    };
 
     settings.addCallback('useFavico', function(useFavico) {
         // this check is necessary as this is called on page load, too
@@ -658,6 +669,25 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         return !buffer.hidden;
     };
 
+    // filter bufferlist for search or jump key
+    $rootScope.bufferlistfilter = function(buffer) {
+        if ($rootScope.showJumpKeys) {
+            // filter by jump key
+            if ($rootScope.jumpDecimal === undefined) {
+                // no digit input yet, show all buffers
+                return true;
+            } else {
+                var min_jumpKey = 10 * $rootScope.jumpDecimal,
+                    max_jumpKey = 10 * ($rootScope.jumpDecimal + 1);
+                return (min_jumpKey <= buffer.$jumpKey) &&
+                    (buffer.$jumpKey < max_jumpKey);
+            }
+        } else {
+            // filter by buffer name
+            return buffer.fullName.indexOf($scope.search) !== -1;
+        }
+    };
+
     // Watch model and update show setting when it changes
     settings.addCallback('nonicklist', function() {
         $scope.showNicklist = $scope.updateShowNicklist();
diff --git a/js/inputbar.js b/js/inputbar.js
index ac22357..8a0de77 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -253,24 +253,32 @@ weechat.directive('inputBar', function() {
 
                 // if Alt+J was pressed last...
                 if ($rootScope.showJumpKeys) {
+                    var cleanup = function() { // cleanup helper
+                        $rootScope.showJumpKeys = false;
+                        $rootScope.jumpDecimal = undefined;
+                        $scope.$parent.search = '';
+                        $rootScope.refresh_filter_predicate();
+                    };
+
                     // ... we expect two digits now
                     if (!$event.altKey && (code > 47 && code < 58)) {
                         // first digit
-                        if ($scope.jumpDecimal === undefined) {
-                            $scope.jumpDecimal = code - 48;
+                        if ($rootScope.jumpDecimal === undefined) {
+                            $rootScope.jumpDecimal = code - 48;
                             $event.preventDefault();
-                        // second digit
+                            $scope.$parent.search = $rootScope.jumpDecimal;
+                            $rootScope.refresh_filter_predicate();
+                        // second digit, jump to correct buffer
                         } else {
                             bufferNumber = ($rootScope.jumpDecimal * 10) + (code - 48);
                             $scope.$parent.setActiveBuffer(bufferNumber, '$jumpKey');
 
                             $event.preventDefault();
-                            $rootScope.showJumpKeys = false;
-                            $scope.jumpDecimal = undefined;
+                            cleanup();
                         }
                     } else {
-                        $rootScope.showJumpKeys = false;
-                        $scope.jumpDecimal = undefined;
+                        // Not a decimal digit, abort
+                        cleanup();
                     }
                 }
 

From 915d0d5d3eed4ce3e1cbd60e2b50a95592ed9c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?=
 <lorenz-dev@lgh-alumni.de>
Date: Sat, 18 Mar 2017 17:04:37 +0100
Subject: [PATCH 7/8] Reset search state when initiating jump

---
 js/inputbar.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/inputbar.js b/js/inputbar.js
index 8a0de77..8cefb1c 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -409,6 +409,8 @@ weechat.directive('inputBar', function() {
                 // Alt+J -> Jump to buffer
                 if ($event.altKey && (code === 106 || code === 74)) {
                     $event.preventDefault();
+                    // reset search state and show jump keys
+                    $scope.$parent.search = '';
                     $rootScope.showJumpKeys = true;
                     return true;
                 }

From 26d8b5faeee2c8f531e00bb71dc3301fc20ee128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <huebschle@kit.edu>
Date: Thu, 23 Mar 2017 13:41:44 +0100
Subject: [PATCH 8/8] Animate jumpkey transition & change placeholder to
 "Number"

---
 css/glowingbear.css | 15 ++++++++++-----
 index.html          |  4 ++--
 js/glowingbear.js   |  1 +
 js/inputbar.js      |  2 ++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/css/glowingbear.css b/css/glowingbear.css
index 51a7236..c1a36f0 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -83,12 +83,17 @@ td.message {
     color: #ccc;
 }
 
-.buffer-jump {
-   display: none;
+#jump-addon {
+    width: 0px;
+    max-width: 0px;
+    padding: 0;
+    overflow: hidden;
+    transition: all ease-in-out 0.5s;
 }
-
-.showjumpkeys .buffer-jump {
-   display: table-cell;
+.showjumpkeys #jump-addon {
+    width: auto;
+    max-width: 70px;
+    padding: 6px 12px;
 }
 
 .footer button {
diff --git a/index.html b/index.html
index 8f7f5fe..49cf704 100644
--- a/index.html
+++ b/index.html
@@ -266,8 +266,8 @@ npm run build-electron-{windows, darwin, linux}</pre>
           <li class="bufferfilter">
             <form role="form">
               <div class="input-group">
-                <span class="input-group-addon buffer-jump" id="jump-addon">Jump:</span>
-                <input class="form-control favorite-font" type="text" id="bufferFilter" ng-model="search" ng-keydown="handleSearchBoxKey($event)" placeholder="Search" autocomplete="off" aria-describedby="jump-addon">
+                <span class="input-group-addon" id="jump-addon">Jump</span>
+                <input class="form-control favorite-font" type="text" id="bufferFilter" ng-model="search" ng-keydown="handleSearchBoxKey($event)" placeholder="{{ search_placeholder || 'Search' }}" autocomplete="off" aria-describedby="jump-addon">
               </div>
             </form>
           </li>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 305817a..b78d648 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -208,6 +208,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
         // Clear search term on buffer change
         $scope.search = '';
+        $scope.search_placeholder = 'Search';
 
         if (!utils.isMobileUi()) {
             // This needs to happen asynchronously to prevent the enter key handler
diff --git a/js/inputbar.js b/js/inputbar.js
index 8cefb1c..3e310b0 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -257,6 +257,7 @@ weechat.directive('inputBar', function() {
                         $rootScope.showJumpKeys = false;
                         $rootScope.jumpDecimal = undefined;
                         $scope.$parent.search = '';
+                        $scope.$parent.search_placeholder = 'Search';
                         $rootScope.refresh_filter_predicate();
                     };
 
@@ -411,6 +412,7 @@ weechat.directive('inputBar', function() {
                     $event.preventDefault();
                     // reset search state and show jump keys
                     $scope.$parent.search = '';
+                    $scope.$parent.search_placeholder = 'Number';
                     $rootScope.showJumpKeys = true;
                     return true;
                 }