revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-03 03:11:01 +01:00
Code Issues Releases Wiki Activity

Fix hovercard behavior for multiple copies of the same object

Browse source 
Summary: Ref T8980. Previously, if you had like `T123 T123 T123` and waved your mouse over them, we wouldn't move the card. Now, move the card.

Test Plan: Waved mouse. Saw the card move.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T8980

Differential Revision: https://secure.phabricator.com/D14881
This commit is contained in:
epriestley 2015-12-24 12:37:38 -08:00
parent 8025bc6432
commit e0ad791247
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
resources/celerity/map.php
View file

@ -8,7 +8,7 @@
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => 'a419cf4b', 'core.pkg.css' => 'a419cf4b',
'core.pkg.js' => '2a50ac55', 'core.pkg.js' => '400453e4',
'darkconsole.pkg.js' => 'e7393ebb', 'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9', 'differential.pkg.css' => '2de124c9',
'differential.pkg.js' => '64e69521', 'differential.pkg.js' => '64e69521',
@ -452,7 +452,7 @@ return array(
'rsrc/js/core/DragAndDropFileUpload.js' => 'ad10aeac', 'rsrc/js/core/DragAndDropFileUpload.js' => 'ad10aeac',
'rsrc/js/core/DraggableList.js' => 'a16ec1c6', 'rsrc/js/core/DraggableList.js' => 'a16ec1c6',
'rsrc/js/core/FileUpload.js' => '477359c8', 'rsrc/js/core/FileUpload.js' => '477359c8',
'rsrc/js/core/Hovercard.js' => '88e3466d', 'rsrc/js/core/Hovercard.js' => 'c6f720ff',
'rsrc/js/core/KeyboardShortcut.js' => '1ae869f2', 'rsrc/js/core/KeyboardShortcut.js' => '1ae869f2',
'rsrc/js/core/KeyboardShortcutManager.js' => 'c1700f6f', 'rsrc/js/core/KeyboardShortcutManager.js' => 'c1700f6f',
'rsrc/js/core/MultirowRowManager.js' => 'b5d57730', 'rsrc/js/core/MultirowRowManager.js' => 'b5d57730',
@ -747,7 +747,7 @@ return array(
'phabricator-file-upload' => '477359c8', 'phabricator-file-upload' => '477359c8',
'phabricator-filetree-view-css' => 'fccf9f82', 'phabricator-filetree-view-css' => 'fccf9f82',
'phabricator-flag-css' => '5337623f', 'phabricator-flag-css' => '5337623f',
'phabricator-hovercard' => '88e3466d', 'phabricator-hovercard' => 'c6f720ff',
'phabricator-hovercard-view-css' => '1239cd52', 'phabricator-hovercard-view-css' => '1239cd52',
'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut' => '1ae869f2',
'phabricator-keyboard-shortcut-manager' => 'c1700f6f', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f',
@ -1461,13 +1461,6 @@ return array(
'javelin-stratcom', 'javelin-stratcom',
'javelin-dom', 'javelin-dom',
), ),
'88e3466d' => array(
'javelin-install',
'javelin-dom',
'javelin-vector',
'javelin-request',
'javelin-uri',
),
'88f0c5b3' => array( '88f0c5b3' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-dom', 'javelin-dom',
@ -1780,6 +1773,13 @@ return array(
'javelin-dom', 'javelin-dom',
'javelin-vector', 'javelin-vector',
), ),
'c6f720ff' => array(
'javelin-install',
'javelin-dom',
'javelin-vector',
'javelin-request',
'javelin-uri',
),
'c72aa091' => array( 'c72aa091' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-dom', 'javelin-dom',

2
src/infrastructure/customfield/field/PhabricatorCustomField.php
View file

@ -506,7 +506,7 @@ abstract class PhabricatorCustomField extends Phobject {
$out = array(); $out = array();
foreach ($handles as $handle) { foreach ($handles as $handle) {
$out[] = $handle->renderLink(); $out[] = $handle->renderHovercardLink();
} }
return phutil_implode_html(phutil_tag('br'), $out); return phutil_implode_html(phutil_tag('br'), $out);

5
webroot/rsrc/js/core/Hovercard.js
View file

@ -39,10 +39,11 @@ JX.install('Hovercard', {
show : function(root, phid) { show : function(root, phid) {
var self = JX.Hovercard; var self = JX.Hovercard;
// Already displaying
if (self.getCard() && phid == self._visiblePHID) { if (root === this._activeRoot) {
return; return;
} }
self.hide(); self.hide();
self._visiblePHID = phid; self._visiblePHID = phid;