Page MenuHomePhabricator
Files F14104751

D12044.diff
No OneTemporary
Actions

D12044.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' => 'efef202b',
- 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'aa3b6c22',
+ 'rsrc/js/application/conpherence/behavior-durable-column.js' => '016fa2e9',
'rsrc/js/application/conpherence/behavior-menu.js' => 'e476c952',
'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' => 'aa3b6c22',
+ 'javelin-behavior-durable-column' => '016fa2e9',
'javelin-behavior-error-log' => '6882e80a',
'javelin-behavior-fancy-datepicker' => 'c51ae228',
'javelin-behavior-global-drag-and-drop' => '07f199d8',
@@ -834,6 +834,15 @@
'unhandled-exception-css' => '37d4f9a2',
),
'requires' => array(
+ '016fa2e9' => array(
+ 'javelin-behavior',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ 'javelin-scrollbar',
+ 'javelin-quicksand',
+ 'phabricator-keyboard-shortcut',
+ 'conpherence-thread-manager',
+ ),
'0286a1db' => array(
'javelin-dom',
'javelin-util',
@@ -1654,15 +1663,6 @@
'javelin-util',
'phabricator-prefab',
),
- 'aa3b6c22' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-stratcom',
- 'javelin-scrollbar',
- 'javelin-quicksand',
- 'phabricator-keyboard-shortcut',
- 'conpherence-thread-manager',
- ),
'b1f0ccee' => array(
'javelin-install',
'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
@@ -296,10 +296,10 @@
'key' => 'go_conpherence',
),
array(
- 'name' => pht('Close Window'),
+ 'name' => pht('Hide Column'),
'href' => '#',
'icon' => 'fa-times',
- 'key' => 'close_window',
+ 'key' => 'hide_column',
),);
}
diff --git a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js
--- a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js
+++ b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js
@@ -152,9 +152,9 @@
case 'go_conpherence':
JX.$U(link.href).go();
break;
- case 'close_window':
+ case 'hide_column':
JX.Stratcom.invoke('notification-panel-close');
- _toggleColumn();
+ _toggleColumn(true);
break;
}
});

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 28, 12:34 AM (18 h, 51 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6797489
Default Alt Text
D12044.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility