@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix a bad variable in global typehaead order/limit code
Summary: Ref T12538. I missed this in D17695, which renamed the variable. The logic was also a little off since `jj` is an index, not a count.
Test Plan: Typed `con` in global search, which hits "Con-pherence", "Con-duit" and "Con-fig", plus a bunch of other stuff. Got results after patch.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T12538
Differential Revision: https://secure.phabricator.com/D17700
+16
-17
+14
-14
resources/celerity/map.php
+14
-14
resources/celerity/map.php
···
10
10
'conpherence.pkg.css' => '437d3b5a',
11
11
'conpherence.pkg.js' => '281b1a73',
12
12
'core.pkg.css' => 'b2ad82f4',
13
-
'core.pkg.js' => 'bf3b5cdf',
13
+
'core.pkg.js' => 'deabcef7',
14
14
'darkconsole.pkg.js' => 'e7393ebb',
15
15
'differential.pkg.css' => '90b30783',
16
16
'differential.pkg.js' => 'ddfeb49b',
···
510
510
'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
511
511
'rsrc/js/core/behavior-reveal-content.js' => '60821bc7',
512
512
'rsrc/js/core/behavior-scrollbar.js' => '834a1173',
513
-
'rsrc/js/core/behavior-search-typeahead.js' => '0f2a0820',
513
+
'rsrc/js/core/behavior-search-typeahead.js' => 'eded9ee8',
514
514
'rsrc/js/core/behavior-select-content.js' => 'bf5374ef',
515
515
'rsrc/js/core/behavior-select-on-click.js' => '4e3e79a6',
516
516
'rsrc/js/core/behavior-setup-check-https.js' => '491416b3',
···
666
666
'javelin-behavior-phabricator-oncopy' => '2926fff2',
667
667
'javelin-behavior-phabricator-remarkup-assist' => '0ca788bd',
668
668
'javelin-behavior-phabricator-reveal-content' => '60821bc7',
669
-
'javelin-behavior-phabricator-search-typeahead' => '0f2a0820',
669
+
'javelin-behavior-phabricator-search-typeahead' => 'eded9ee8',
670
670
'javelin-behavior-phabricator-show-older-transactions' => '94c65b72',
671
671
'javelin-behavior-phabricator-tooltips' => 'c420b0b9',
672
672
'javelin-behavior-phabricator-transaction-comment-form' => 'b23b49e6',
···
987
987
'javelin-vector',
988
988
'phuix-autocomplete',
989
989
'javelin-mask',
990
-
),
991
-
'0f2a0820' => array(
992
-
'javelin-behavior',
993
-
'javelin-typeahead-ondemand-source',
994
-
'javelin-typeahead',
995
-
'javelin-dom',
996
-
'javelin-uri',
997
-
'javelin-util',
998
-
'javelin-stratcom',
999
-
'phabricator-prefab',
1000
-
'phuix-icon-view',
1001
990
),
1002
991
'0f764c35' => array(
1003
992
'javelin-install',
···
2154
2143
'javelin-workflow',
2155
2144
'javelin-dom',
2156
2145
'phabricator-draggable-list',
2146
+
),
2147
+
'eded9ee8' => array(
2148
+
'javelin-behavior',
2149
+
'javelin-typeahead-ondemand-source',
2150
+
'javelin-typeahead',
2151
+
'javelin-dom',
2152
+
'javelin-uri',
2153
+
'javelin-util',
2154
+
'javelin-stratcom',
2155
+
'phabricator-prefab',
2156
+
'phuix-icon-view',
2157
2157
),
2158
2158
'edf8a145' => array(
2159
2159
'javelin-behavior',
+2
-3
webroot/rsrc/js/core/behavior-search-typeahead.js
+2
-3
webroot/rsrc/js/core/behavior-search-typeahead.js
···
94
94
// If we have more results than fit, limit each type of result to 3, so
95
95
// we show 3 applications, then 3 users, etc. For jump items, we show only
96
96
// one result.
97
-
98
97
var jj;
99
98
var results = [];
100
99
for (ii = 0; ii < type_order.length; ii++) {
···
108
107
// - we have more items than will fit in the typeahead, and this
109
108
// is the 4..Nth result of its type.
110
109
111
-
var skip = ((current_type == 'jump') && (jj > 1)) ||
112
-
((list.length > config.limit) && (type_count > 3));
110
+
var skip = ((current_type == 'jump') && (jj >= 1)) ||
111
+
((list.length > config.limit) && (jj >= 3));
113
112
if (skip) {
114
113
continue;
115
114
}