@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
Conpherence - fix "pop in" effect
Summary: Ref T7014. This got broken in today's action. For whatever reason the only way I can get the CSS to show up correctly is to move the require statement to where it was before rP5ef99dba2afc9f9ed3ca77707366a78be15f4871. Otherwise, this feature massages the UI a bit to make sure the "loading" stuff is set correctly in this state.
Test Plan: toggled conpherence open and it looked good. reloaded and it looked good.
Reviewers: chad, epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T7014
Differential Revision: https://secure.phabricator.com/D12047
+30
-15
+11
-11
resources/celerity/map.php
+11
-11
resources/celerity/map.php
···
353
353
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
354
354
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
355
355
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '0324970d',
356
-
'rsrc/js/application/conpherence/behavior-durable-column.js' => '44100dc7',
356
+
'rsrc/js/application/conpherence/behavior-durable-column.js' => '64fc1053',
357
357
'rsrc/js/application/conpherence/behavior-menu.js' => 'c4151295',
358
358
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
359
359
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
···
585
585
'javelin-behavior-diffusion-locate-file' => '6d3e1947',
586
586
'javelin-behavior-diffusion-pull-lastmodified' => '2b228192',
587
587
'javelin-behavior-doorkeeper-tag' => 'e5822781',
588
-
'javelin-behavior-durable-column' => '44100dc7',
588
+
'javelin-behavior-durable-column' => '64fc1053',
589
589
'javelin-behavior-error-log' => '6882e80a',
590
590
'javelin-behavior-fancy-datepicker' => 'c51ae228',
591
591
'javelin-behavior-global-drag-and-drop' => '07f199d8',
···
1110
1110
'javelin-dom',
1111
1111
'javelin-request',
1112
1112
),
1113
-
'44100dc7' => array(
1114
-
'javelin-behavior',
1115
-
'javelin-dom',
1116
-
'javelin-stratcom',
1117
-
'javelin-scrollbar',
1118
-
'javelin-quicksand',
1119
-
'phabricator-keyboard-shortcut',
1120
-
'conpherence-thread-manager',
1121
-
),
1122
1113
'44168bad' => array(
1123
1114
'javelin-behavior',
1124
1115
'javelin-dom',
···
1265
1256
'javelin-install',
1266
1257
'javelin-dom',
1267
1258
'javelin-fx',
1259
+
),
1260
+
'64fc1053' => array(
1261
+
'javelin-behavior',
1262
+
'javelin-dom',
1263
+
'javelin-stratcom',
1264
+
'javelin-scrollbar',
1265
+
'javelin-quicksand',
1266
+
'phabricator-keyboard-shortcut',
1267
+
'conpherence-thread-manager',
1268
1268
),
1269
1269
'6882e80a' => array(
1270
1270
'javelin-dom',
+16
-3
src/applications/conpherence/view/ConpherenceDurableColumnView.php
+16
-3
src/applications/conpherence/view/ConpherenceDurableColumnView.php
···
7
7
private $selectedConpherence;
8
8
private $transactions;
9
9
private $visible;
10
+
private $initialLoad = false;
10
11
11
12
public function setConpherences(array $conpherences) {
12
13
assert_instances_of($conpherences, 'ConpherenceThread');
···
56
57
return $this->visible;
57
58
}
58
59
60
+
public function setInitialLoad($bool) {
61
+
$this->initialLoad = $bool;
62
+
return $this;
63
+
}
64
+
65
+
public function getInitialLoad() {
66
+
return $this->initialLoad;
67
+
}
68
+
59
69
protected function getTagAttributes() {
60
70
if ($this->getVisible()) {
61
71
$style = null;
62
72
} else {
63
73
$style = 'display: none;';
64
74
}
75
+
$classes = array('conpherence-durable-column');
76
+
if ($this->getInitialLoad()) {
77
+
$classes[] = 'loading';
78
+
}
65
79
66
80
return array(
67
81
'id' => 'conpherence-durable-column',
68
-
'class' => 'conpherence-durable-column',
82
+
'class' => implode(' ', $classes),
69
83
'style' => $style,
70
84
'sigil' => 'conpherence-durable-column',
71
85
);
···
73
87
74
88
protected function getTagContent() {
75
89
$column_key = PhabricatorUserPreferences::PREFERENCE_CONPHERENCE_COLUMN;
76
-
require_celerity_resource('conpherence-durable-column-view');
77
90
require_celerity_resource('font-source-sans-pro');
78
91
79
92
Javelin::initBehavior(
···
317
330
private function buildTransactions() {
318
331
$conpherence = $this->getSelectedConpherence();
319
332
if (!$conpherence) {
320
-
if (!$this->getVisible()) {
333
+
if (!$this->getVisible() || $this->getInitialLoad()) {
321
334
return pht('Loading...');
322
335
}
323
336
return array(
+3
-1
src/view/page/PhabricatorStandardPageView.php
+3
-1
src/view/page/PhabricatorStandardPageView.php
···
160
160
require_celerity_resource('phui-form-css');
161
161
require_celerity_resource('sprite-gradient-css');
162
162
require_celerity_resource('phabricator-standard-page-view');
163
+
require_celerity_resource('conpherence-durable-column-view');
163
164
164
165
Javelin::initBehavior('workflow', array());
165
166
···
420
421
$durable_column = id(new ConpherenceDurableColumnView())
421
422
->setSelectedConpherence(null)
422
423
->setUser($user)
423
-
->setVisible($is_visible);
424
+
->setVisible($is_visible)
425
+
->setInitialLoad(true);
424
426
}
425
427
426
428
Javelin::initBehavior('quicksand-blacklist', array(