@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
Clean up css race condition in Conpherence notification menu
Summary: Depending on when packages loaded, this CSS sometimes gets overwritten. Make it more specific and always present.
Test Plan: Reload a lot
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D16657
+5
-6
+3
-3
resources/celerity/map.php
+3
-3
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'conpherence.pkg.css' => '1bc6cd0d',
10
+
'conpherence.pkg.css' => 'ffcfadf9',
11
11
'conpherence.pkg.js' => '11f3e07e',
12
12
'core.pkg.css' => '3fa66cb3',
13
13
'core.pkg.js' => '30185d95',
···
50
50
'rsrc/css/application/conpherence/header-pane.css' => '517de9fe',
51
51
'rsrc/css/application/conpherence/menu.css' => '78c7b811',
52
52
'rsrc/css/application/conpherence/message-pane.css' => '0d7dff02',
53
-
'rsrc/css/application/conpherence/notification.css' => '65dd0e79',
53
+
'rsrc/css/application/conpherence/notification.css' => '965db05b',
54
54
'rsrc/css/application/conpherence/participant-pane.css' => '7bba0b56',
55
55
'rsrc/css/application/conpherence/transaction.css' => '46253e19',
56
56
'rsrc/css/application/conpherence/update.css' => '53bc527a',
···
622
622
'conpherence-header-pane-css' => '517de9fe',
623
623
'conpherence-menu-css' => '78c7b811',
624
624
'conpherence-message-pane-css' => '0d7dff02',
625
-
'conpherence-notification-css' => '65dd0e79',
625
+
'conpherence-notification-css' => '965db05b',
626
626
'conpherence-participant-pane-css' => '7bba0b56',
627
627
'conpherence-thread-manager' => '01774ab2',
628
628
'conpherence-transaction-css' => '46253e19',
+1
-1
src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
+1
-1
src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
···
6
6
public function handleRequest(AphrontRequest $request) {
7
7
$user = $request->getUser();
8
8
$conpherences = array();
9
+
require_celerity_resource('conpherence-notification-css');
9
10
$unread_status = ConpherenceParticipationStatus::BEHIND;
10
11
11
12
$participant_data = id(new ConpherenceParticipantQuery())
···
25
26
}
26
27
27
28
if ($conpherences) {
28
-
require_celerity_resource('conpherence-notification-css');
29
29
// re-order the conpherences based on participation data
30
30
$conpherences = array_select_keys(
31
31
$conpherences, array_keys($participant_data));