Page MenuHomePhabricator

D16397.id39432.diff
No OneTemporary

D16397.id39432.diff

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -422,7 +422,7 @@
'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef',
'rsrc/js/application/policy/behavior-policy-control.js' => 'd0c516d5',
'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c',
- 'rsrc/js/application/projects/WorkboardBoard.js' => '52291776',
+ 'rsrc/js/application/projects/WorkboardBoard.js' => 'fe7cb52a',
'rsrc/js/application/projects/WorkboardCard.js' => 'c587b80f',
'rsrc/js/application/projects/WorkboardColumn.js' => 'bae58312',
'rsrc/js/application/projects/WorkboardController.js' => '55baf5ed',
@@ -750,7 +750,7 @@
'javelin-view-renderer' => '6c2b09a2',
'javelin-view-visitor' => 'efe49472',
'javelin-websocket' => 'e292eaf4',
- 'javelin-workboard-board' => '52291776',
+ 'javelin-workboard-board' => 'fe7cb52a',
'javelin-workboard-card' => 'c587b80f',
'javelin-workboard-column' => 'bae58312',
'javelin-workboard-controller' => '55baf5ed',
@@ -1297,15 +1297,6 @@
'javelin-vector',
'javelin-typeahead-static-source',
),
- 52291776 => array(
- 'javelin-install',
- 'javelin-dom',
- 'javelin-util',
- 'javelin-stratcom',
- 'javelin-workflow',
- 'phabricator-draggable-list',
- 'javelin-workboard-column',
- ),
'5359e785' => array(
'javelin-install',
'javelin-util',
@@ -2219,6 +2210,15 @@
'javelin-view-visitor',
'javelin-util',
),
+ 'fe7cb52a' => array(
+ 'javelin-install',
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-stratcom',
+ 'javelin-workflow',
+ 'phabricator-draggable-list',
+ 'javelin-workboard-column',
+ ),
'fea0eb47' => array(
'javelin-install',
),
diff --git a/webroot/rsrc/js/application/projects/WorkboardBoard.js b/webroot/rsrc/js/application/projects/WorkboardBoard.js
--- a/webroot/rsrc/js/application/projects/WorkboardBoard.js
+++ b/webroot/rsrc/js/application/projects/WorkboardBoard.js
@@ -216,8 +216,18 @@
}
var column_maps = response.columnMaps;
+ var natural_column;
for (var natural_phid in column_maps) {
- this.getColumn(natural_phid).setNaturalOrder(column_maps[natural_phid]);
+ natural_column = this.getColumn(natural_phid);
+ if (!natural_column) {
+ // Our view of the board may be out of date, so we might get back
+ // information about columns that aren't visible. Just ignore the
+ // position information for any columns we aren't displaying on the
+ // client.
+ continue;
+ }
+
+ natural_column.setNaturalOrder(column_maps[natural_phid]);
}
var property_maps = response.propertyMaps;

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 6:12 AM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7333835
Default Alt Text
D16397.id39432.diff (2 KB)

Event Timeline