@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 Conpherence
Summary: D5426 removed mobile menu for messages but missed a few spots
Test Plan: successfully submitted pontifications without JS errors and the form freezing
Reviewers: chad, epriestley
Reviewed By: chad
CC: aran, Korvin
Differential Revision: https://secure.phabricator.com/D5453
+7
-27
+3
-3
src/__celerity_resource_map__.php
+3
-3
src/__celerity_resource_map__.php
···
1190
1190
),
1191
1191
'javelin-behavior-conpherence-menu' =>
1192
1192
array(
1193
-
'uri' => '/res/bcd715e1/rsrc/js/application/conpherence/behavior-menu.js',
1193
+
'uri' => '/res/e04bb055/rsrc/js/application/conpherence/behavior-menu.js',
1194
1194
'type' => 'js',
1195
1195
'requires' =>
1196
1196
array(
···
1206
1206
),
1207
1207
'javelin-behavior-conpherence-pontificate' =>
1208
1208
array(
1209
-
'uri' => '/res/fe634761/rsrc/js/application/conpherence/behavior-pontificate.js',
1209
+
'uri' => '/res/abc4d947/rsrc/js/application/conpherence/behavior-pontificate.js',
1210
1210
'type' => 'js',
1211
1211
'requires' =>
1212
1212
array(
···
1219
1219
),
1220
1220
'javelin-behavior-conpherence-widget-pane' =>
1221
1221
array(
1222
-
'uri' => '/res/52b80633/rsrc/js/application/conpherence/behavior-widget-pane.js',
1222
+
'uri' => '/res/45d53f1f/rsrc/js/application/conpherence/behavior-widget-pane.js',
1223
1223
'type' => 'js',
1224
1224
'requires' =>
1225
1225
array(
+4
-10
src/applications/conpherence/controller/ConpherenceController.php
+4
-10
src/applications/conpherence/controller/ConpherenceController.php
···
113
113
$nav = $this->addConpherencesToNav(
114
114
$unread_conpherences,
115
115
$nav,
116
-
false,
117
-
$for_application);
116
+
false);
118
117
$nav->addLabel(pht('Read'));
119
118
$nav = $this->addConpherencesToNav(
120
119
$read_conpherences,
121
120
$nav,
122
-
true,
123
-
$for_application);
121
+
true);
124
122
$nav->selectFilter($filter);
125
123
} else {
126
124
$nav->addFilter(
···
135
133
private function addConpherencesToNav(
136
134
array $conpherences,
137
135
AphrontSideNavFilterView $nav,
138
-
$read = false,
139
-
$for_application = false) {
136
+
$read = false) {
140
137
141
138
$user = $this->getRequest()->getUser();
142
-
$id_suffix = $for_application ? '-menu-item' : '-nav-item';
143
139
foreach ($conpherences as $conpherence) {
144
140
$selected = false;
145
141
if ($this->getSelectedConpherencePHID() == $conpherence->getPHID()) {
···
147
143
}
148
144
$item = $this->buildConpherenceMenuItem(
149
145
$conpherence,
150
-
$id_suffix,
151
146
$selected);
152
147
153
148
$nav->addCustomBlock($item->render());
···
192
187
193
188
protected function buildConpherenceMenuItem(
194
189
$conpherence,
195
-
$id_suffix,
196
190
$selected) {
197
191
198
192
$user = $this->getRequest()->getUser();
···
216
210
->setImageURI($image)
217
211
->setMessageText($snippet)
218
212
->setUnreadCount($unread_count)
219
-
->setID($conpherence->getPHID().$id_suffix)
213
+
->setID($conpherence->getPHID().'-nav-item')
220
214
->addSigil('conpherence-menu-click')
221
215
->setMetadata(array('id' => $conpherence->getID()));
222
216
-6
src/applications/conpherence/controller/ConpherenceUpdateController.php
-6
src/applications/conpherence/controller/ConpherenceUpdateController.php
···
268
268
$selected = true;
269
269
$nav_item = $this->buildConpherenceMenuItem(
270
270
$conpherence,
271
-
'-nav-item',
272
-
$selected);
273
-
$menu_item = $this->buildConpherenceMenuItem(
274
-
$conpherence,
275
-
'-menu-item',
276
271
$selected);
277
272
278
273
$header = $this->buildHeaderPaneContent($conpherence);
···
286
281
$content = array(
287
282
'transactions' => $rendered_transactions,
288
283
'latest_transaction_id' => $new_latest_transaction_id,
289
-
'menu_item' => $menu_item->render(),
290
284
'nav_item' => $nav_item->render(),
291
285
'conpherence_phid' => $conpherence->getPHID(),
292
286
'header' => $header,
-4
webroot/rsrc/js/application/conpherence/behavior-pontificate.js
-4
webroot/rsrc/js/application/conpherence/behavior-pontificate.js