Page MenuHomePhabricator
Files F15498499

D12047.id28998.diff
No OneTemporary
Actions

D12047.id28998.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -353,7 +353,7 @@
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '0324970d',
- 'rsrc/js/application/conpherence/behavior-durable-column.js' => '44100dc7',
+ 'rsrc/js/application/conpherence/behavior-durable-column.js' => '64fc1053',
'rsrc/js/application/conpherence/behavior-menu.js' => 'c4151295',
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
@@ -585,7 +585,7 @@
'javelin-behavior-diffusion-locate-file' => '6d3e1947',
'javelin-behavior-diffusion-pull-lastmodified' => '2b228192',
'javelin-behavior-doorkeeper-tag' => 'e5822781',
- 'javelin-behavior-durable-column' => '44100dc7',
+ 'javelin-behavior-durable-column' => '64fc1053',
'javelin-behavior-error-log' => '6882e80a',
'javelin-behavior-fancy-datepicker' => 'c51ae228',
'javelin-behavior-global-drag-and-drop' => '07f199d8',
@@ -1110,15 +1110,6 @@
'javelin-dom',
'javelin-request',
),
- '44100dc7' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-stratcom',
- 'javelin-scrollbar',
- 'javelin-quicksand',
- 'phabricator-keyboard-shortcut',
- 'conpherence-thread-manager',
- ),
'44168bad' => array(
'javelin-behavior',
'javelin-dom',
@@ -1266,6 +1257,15 @@
'javelin-dom',
'javelin-fx',
),
+ '64fc1053' => array(
+ 'javelin-behavior',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ 'javelin-scrollbar',
+ 'javelin-quicksand',
+ 'phabricator-keyboard-shortcut',
+ 'conpherence-thread-manager',
+ ),
'6882e80a' => array(
'javelin-dom',
),
diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
--- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php
+++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
@@ -7,6 +7,7 @@
private $selectedConpherence;
private $transactions;
private $visible;
+ private $initialLoad = false;
public function setConpherences(array $conpherences) {
assert_instances_of($conpherences, 'ConpherenceThread');
@@ -56,16 +57,29 @@
return $this->visible;
}
+ public function setInitialLoad($bool) {
+ $this->initialLoad = $bool;
+ return $this;
+ }
+
+ public function getInitialLoad() {
+ return $this->initialLoad;
+ }
+
protected function getTagAttributes() {
if ($this->getVisible()) {
$style = null;
} else {
$style = 'display: none;';
}
+ $classes = array('conpherence-durable-column');
+ if ($this->getInitialLoad()) {
+ $classes[] = 'loading';
+ }
return array(
'id' => 'conpherence-durable-column',
- 'class' => 'conpherence-durable-column',
+ 'class' => implode(' ', $classes),
'style' => $style,
'sigil' => 'conpherence-durable-column',
);
@@ -73,7 +87,6 @@
protected function getTagContent() {
$column_key = PhabricatorUserPreferences::PREFERENCE_CONPHERENCE_COLUMN;
- require_celerity_resource('conpherence-durable-column-view');
require_celerity_resource('font-source-sans-pro');
Javelin::initBehavior(
@@ -317,7 +330,7 @@
private function buildTransactions() {
$conpherence = $this->getSelectedConpherence();
if (!$conpherence) {
- if (!$this->getVisible()) {
+ if (!$this->getVisible() || $this->getInitialLoad()) {
return pht('Loading...');
}
return array(
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -160,6 +160,7 @@
require_celerity_resource('phui-form-css');
require_celerity_resource('sprite-gradient-css');
require_celerity_resource('phabricator-standard-page-view');
+ require_celerity_resource('conpherence-durable-column-view');
Javelin::initBehavior('workflow', array());
@@ -420,7 +421,8 @@
$durable_column = id(new ConpherenceDurableColumnView())
->setSelectedConpherence(null)
->setUser($user)
- ->setVisible($is_visible);
+ ->setVisible($is_visible)
+ ->setInitialLoad(true);
}
Javelin::initBehavior('quicksand-blacklist', array(

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 14, 1:04 PM (1 d, 6 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7592157
Default Alt Text
D12047.id28998.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility