@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 Conphernce sometimes searching wrong room
Summary: I passed this in as a config, but need to parse it live when threads change, otherwise the wrong room could be searched.
Test Plan: Search in one room, click a second, search again, see correct results.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D16707
+14
-16
+9
-9
resources/celerity/map.php
+9
-9
resources/celerity/map.php
···
436
436
'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f',
437
437
'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408',
438
438
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2',
439
-
'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '3bc9d2b1',
439
+
'rsrc/js/application/conpherence/behavior-conpherence-search.js' => 'dfa4e1ac',
440
440
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c5238acb',
441
441
'rsrc/js/application/conpherence/behavior-menu.js' => '07928ca3',
442
442
'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8',
···
666
666
'javelin-behavior-conpherence-menu' => '07928ca3',
667
667
'javelin-behavior-conpherence-participant-pane' => '8604caa8',
668
668
'javelin-behavior-conpherence-pontificate' => 'f2e58483',
669
-
'javelin-behavior-conpherence-search' => '3bc9d2b1',
669
+
'javelin-behavior-conpherence-search' => 'dfa4e1ac',
670
670
'javelin-behavior-countdown-timer' => 'e4cc26b3',
671
671
'javelin-behavior-dark-console' => 'f411b6ae',
672
672
'javelin-behavior-dashboard-async-panel' => '469c0d9e',
···
1218
1218
'javelin-vector',
1219
1219
'javelin-dom',
1220
1220
'javelin-magical-init',
1221
-
),
1222
-
'3bc9d2b1' => array(
1223
-
'javelin-behavior',
1224
-
'javelin-dom',
1225
-
'javelin-util',
1226
-
'javelin-workflow',
1227
-
'javelin-stratcom',
1228
1221
),
1229
1222
'3cb0b2fc' => array(
1230
1223
'javelin-behavior',
···
2094
2087
),
2095
2088
'df5e11d2' => array(
2096
2089
'javelin-install',
2090
+
),
2091
+
'dfa4e1ac' => array(
2092
+
'javelin-behavior',
2093
+
'javelin-dom',
2094
+
'javelin-util',
2095
+
'javelin-workflow',
2096
+
'javelin-stratcom',
2097
2097
),
2098
2098
'e0ec7f2f' => array(
2099
2099
'javelin-behavior',
+2
-5
src/applications/conpherence/controller/ConpherenceController.php
+2
-5
src/applications/conpherence/controller/ConpherenceController.php
···
113
113
->setHref('#')
114
114
->addClass('conpherence-participant-toggle'));
115
115
116
-
Javelin::initBehavior(
117
-
'conpherence-search',
118
-
array(
119
-
'searchURI' => '/conpherence/threadsearch/'.$conpherence->getID().'/',
120
-
));
116
+
Javelin::initBehavior('conpherence-search');
121
117
122
118
$header->addActionItem(
123
119
id(new PHUIIconCircleView())
···
187
183
'action' => '/conpherence/threadsearch/'.$id.'/',
188
184
'sigil' => 'conpherence-search-form',
189
185
'class' => 'conpherence-search-form',
186
+
'id' => 'conpherence-search-form',
190
187
),
191
188
array(
192
189
$bar,
+3
-2
webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js
+3
-2
webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js
···
7
7
* javelin-stratcom
8
8
*/
9
9
10
-
JX.behavior('conpherence-search', function(config) {
10
+
JX.behavior('conpherence-search', function() {
11
11
12
12
var shown = true;
13
13
var request = null;
···
24
24
function _doSearch(e) {
25
25
e.kill();
26
26
var search_text = JX.$('conpherence-search-input').value;
27
+
var search_uri = JX.$('conpherence-search-form').action;
27
28
var search_node = JX.$('conpherence-search-results');
28
29
29
30
if (request || !search_text) {
30
31
return;
31
32
}
32
33
33
-
request = new JX.Request(config.searchURI, function(response) {
34
+
request = new JX.Request(search_uri, function(response) {
34
35
JX.DOM.setContent(search_node, JX.$H(response));
35
36
request = null;
36
37
});