Page MenuHomePhabricator
Files F13223873

D10967.id26337.diff
No OneTemporary
Actions

D10967.id26337.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
@@ -8,7 +8,7 @@
return array(
'names' => array(
'core.pkg.css' => 'a157f664',
- 'core.pkg.js' => 'e4556c9b',
+ 'core.pkg.js' => 'da3ab00a',
'darkconsole.pkg.js' => 'df001cab',
'differential.pkg.css' => '8af45893',
'differential.pkg.js' => '42c10e78',
@@ -348,7 +348,7 @@
'rsrc/image/texture/table_header_hover.png' => '038ec3b9',
'rsrc/image/texture/table_header_tall.png' => 'd56b434f',
'rsrc/js/application/aphlict/Aphlict.js' => '4a07e8e3',
- 'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => '72118e8b',
+ 'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => 'f6bc26f0',
'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'a826c925',
'rsrc/js/application/aphlict/behavior-aphlict-status.js' => '58f7803f',
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
@@ -542,7 +542,7 @@
'inline-comment-summary-css' => '8cfd34e8',
'javelin-aphlict' => '4a07e8e3',
'javelin-behavior' => '61cbc29a',
- 'javelin-behavior-aphlict-dropdown' => '72118e8b',
+ 'javelin-behavior-aphlict-dropdown' => 'f6bc26f0',
'javelin-behavior-aphlict-listen' => 'a826c925',
'javelin-behavior-aphlict-status' => '58f7803f',
'javelin-behavior-aphront-basic-tokenizer' => 'b3a4b884',
@@ -1278,16 +1278,6 @@
'phabricator-phtize',
'changeset-view-manager',
),
- '72118e8b' => array(
- 'javelin-behavior',
- 'javelin-request',
- 'javelin-stratcom',
- 'javelin-vector',
- 'javelin-dom',
- 'javelin-uri',
- 'javelin-behavior-device',
- 'phabricator-title',
- ),
'724b1247' => array(
'javelin-behavior',
'javelin-typeahead-ondemand-source',
@@ -1888,6 +1878,16 @@
'javelin-util',
'javelin-reactor',
),
+ 'f6bc26f0' => array(
+ 'javelin-behavior',
+ 'javelin-request',
+ 'javelin-stratcom',
+ 'javelin-vector',
+ 'javelin-dom',
+ 'javelin-uri',
+ 'javelin-behavior-device',
+ 'phabricator-title',
+ ),
'f726d506' => array(
'javelin-behavior',
'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/aphlict/behavior-aphlict-dropdown.js b/webroot/rsrc/js/application/aphlict/behavior-aphlict-dropdown.js
--- a/webroot/rsrc/js/application/aphlict/behavior-aphlict-dropdown.js
+++ b/webroot/rsrc/js/application/aphlict/behavior-aphlict-dropdown.js
@@ -63,17 +63,30 @@
request.send();
}
+ function set_visible(menu, icon) {
+ if (menu) {
+ statics.visible = {menu: menu, icon: icon};
+ if (icon) {
+ JX.DOM.alterClass(icon, 'white', true);
+ }
+ } else {
+ if (statics.visible) {
+ JX.DOM.hide(statics.visible.menu);
+ if (statics.visible.icon) {
+ JX.DOM.alterClass(statics.visible.icon, 'white', false);
+ }
+ }
+ statics.visible = null;
+ }
+ }
+
JX.Stratcom.listen(
'click',
null,
function(e) {
if (!e.getNode('phabricator-notification-menu')) {
// Click outside the dropdown; hide it.
- JX.DOM.hide(dropdown);
- if (icon) {
- JX.DOM.alterClass(icon, 'white', false);
- }
- statics.visible = null;
+ set_visible(null);
return;
}
@@ -116,14 +129,13 @@
// If a menu is currently open, close it.
if (statics.visible) {
var previously_visible = statics.visible;
- JX.DOM.hide(statics.visible);
- statics.visible = null;
+ set_visible(null);
// If the menu we just closed was the menu attached to the clicked
// icon, we're all done -- clicking the icon for an open menu just
// closes it. Otherwise, we closed some other menu and still need to
// open the one the user just clicked.
- if (previously_visible === dropdown) {
+ if (previously_visible.menu === dropdown) {
return;
}
}
@@ -143,11 +155,7 @@
}
p.setPos(dropdown);
- statics.visible = dropdown;
-
- if (icon) {
- JX.DOM.alterClass(icon, 'white', true);
- }
+ set_visible(dropdown, icon);
}
);

File Metadata

Mime Type
text/plain
Expires
Mon, May 20, 5:11 AM (2 w, 2 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6288424
Default Alt Text
D10967.id26337.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility