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' => 'e33b14a4', - 'core.pkg.js' => '7214314b', + 'core.pkg.js' => 'ef5e33db', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', 'differential.pkg.js' => '5c2ba922', @@ -490,7 +490,7 @@ 'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e', 'rsrc/js/core/behavior-reveal-content.js' => '60821bc7', 'rsrc/js/core/behavior-scrollbar.js' => '834a1173', - 'rsrc/js/core/behavior-search-typeahead.js' => '0b7a4f6e', + 'rsrc/js/core/behavior-search-typeahead.js' => '06c32383', 'rsrc/js/core/behavior-select-on-click.js' => '4e3e79a6', 'rsrc/js/core/behavior-time-typeahead.js' => 'f80d6bf0', 'rsrc/js/core/behavior-toggle-class.js' => '5d7c9f33', @@ -640,7 +640,7 @@ 'javelin-behavior-phabricator-oncopy' => '2926fff2', 'javelin-behavior-phabricator-remarkup-assist' => '340c8eff', 'javelin-behavior-phabricator-reveal-content' => '60821bc7', - 'javelin-behavior-phabricator-search-typeahead' => '0b7a4f6e', + 'javelin-behavior-phabricator-search-typeahead' => '06c32383', 'javelin-behavior-phabricator-show-older-transactions' => 'dbbf48b6', 'javelin-behavior-phabricator-tooltips' => '3ee3408b', 'javelin-behavior-phabricator-transaction-comment-form' => 'b23b49e6', @@ -909,6 +909,17 @@ 'javelin-stratcom', 'javelin-workflow', ), + '06c32383' => array( + 'javelin-behavior', + 'javelin-typeahead-ondemand-source', + 'javelin-typeahead', + 'javelin-dom', + 'javelin-uri', + 'javelin-util', + 'javelin-stratcom', + 'phabricator-prefab', + 'phuix-icon-view', + ), '087e919c' => array( 'javelin-install', 'javelin-dom', @@ -922,16 +933,6 @@ 'javelin-dom', 'javelin-router', ), - '0b7a4f6e' => array( - 'javelin-behavior', - 'javelin-typeahead-ondemand-source', - 'javelin-typeahead', - 'javelin-dom', - 'javelin-uri', - 'javelin-util', - 'javelin-stratcom', - 'phabricator-prefab', - ), '0f764c35' => array( 'javelin-install', 'javelin-util', diff --git a/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php b/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php --- a/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php +++ b/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php @@ -47,7 +47,10 @@ ->setPHID(md5($symbol->getURI())) // Just needs to be unique. ->setDisplayName($name) ->setDisplayType(strtoupper($lang).' '.ucwords($type).' ('.$repo.')') - ->setPriorityType('symb'); + ->setPriorityType('symb') + ->setImageSprite( + 'phabricator-search-icon phui-font-fa phui-icon-view fa-code '. + 'lightgreytext'); } } diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php --- a/src/applications/project/storage/PhabricatorProject.php +++ b/src/applications/project/storage/PhabricatorProject.php @@ -379,7 +379,7 @@ $this->getPHID()); $all_strings = ipull($slugs, 'slug'); - $all_strings[] = $this->getName(); + $all_strings[] = $this->getDisplayName(); $all_strings = implode(' ', $all_strings); $tokens = PhabricatorTypeaheadDatasource::tokenizeString($all_strings); diff --git a/src/applications/project/typeahead/PhabricatorProjectDatasource.php b/src/applications/project/typeahead/PhabricatorProjectDatasource.php --- a/src/applications/project/typeahead/PhabricatorProjectDatasource.php +++ b/src/applications/project/typeahead/PhabricatorProjectDatasource.php @@ -70,7 +70,7 @@ $proj_result = id(new PhabricatorTypeaheadResult()) ->setName($all_strings) ->setDisplayName($proj->getDisplayName()) - ->setDisplayType(pht('Project')) + ->setDisplayType($proj->getDisplayIconName()) ->setURI($proj->getURI()) ->setPHID($proj->getPHID()) ->setIcon($proj->getDisplayIconIcon()) diff --git a/webroot/rsrc/js/core/behavior-search-typeahead.js b/webroot/rsrc/js/core/behavior-search-typeahead.js --- a/webroot/rsrc/js/core/behavior-search-typeahead.js +++ b/webroot/rsrc/js/core/behavior-search-typeahead.js @@ -8,6 +8,7 @@ * javelin-util * javelin-stratcom * phabricator-prefab + * phuix-icon-view */ JX.behavior('phabricator-search-typeahead', function(config) { @@ -25,12 +26,22 @@ attr.style = {backgroundImage: 'url('+object.imageURI+')'}; } + var icon = null; + if (object.icon) { + icon = new JX.PHUIXIconView() + .setIcon(object.icon) + .setColor('lightgreytext') + .getNode(); + icon = [icon, ' ']; + } + var render = JX.$N( 'span', attr, [ JX.$N('span', {className: object.sprite}), JX.$N('span', {className: 'result-name'}, object.displayName), + icon, JX.$N('span', {className: 'result-type'}, object.type) ]);