Page MenuHomePhabricator
Files F13180471

D12467.diff
No OneTemporary
Actions

D12467.diff
View Options

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
@@ -63,7 +63,8 @@
->setDisplayType('Project')
->setURI('/tag/'.$proj->getPrimarySlug().'/')
->setPHID($proj->getPHID())
- ->setIcon($proj->getIcon().' '.$proj->getColor())
+ ->setIcon($proj->getIcon())
+ ->setColor($proj->getColor())
->setPriorityType('proj')
->setClosed($closed);
diff --git a/src/applications/typeahead/storage/PhabricatorTypeaheadResult.php b/src/applications/typeahead/storage/PhabricatorTypeaheadResult.php
--- a/src/applications/typeahead/storage/PhabricatorTypeaheadResult.php
+++ b/src/applications/typeahead/storage/PhabricatorTypeaheadResult.php
@@ -12,6 +12,7 @@
private $priorityType;
private $imageSprite;
private $icon;
+ private $color;
private $closed;
private $tokenType;
private $unique;
@@ -104,6 +105,15 @@
return $this->tokenType;
}
+ public function setColor($color) {
+ $this->color = $color;
+ return $this;
+ }
+
+ public function getColor() {
+ return $this->color;
+ }
+
public function getSortKey() {
// Put unique results (special parameter functions) ahead of other
// results.
@@ -129,6 +139,7 @@
$this->getIcon(),
$this->closed,
$this->imageSprite ? (string)$this->imageSprite : null,
+ $this->color,
$this->tokenType,
$this->unique ? 1 : null,
);
@@ -151,7 +162,7 @@
foreach ($types as $type) {
$icon = $type->getTypeIcon();
if ($icon !== null) {
- $map[$type->getTypeConstant()] = "{$icon} bluegrey";
+ $map[$type->getTypeConstant()] = $icon;
}
}
diff --git a/src/applications/typeahead/view/PhabricatorTypeaheadTokenView.php b/src/applications/typeahead/view/PhabricatorTypeaheadTokenView.php
--- a/src/applications/typeahead/view/PhabricatorTypeaheadTokenView.php
+++ b/src/applications/typeahead/view/PhabricatorTypeaheadTokenView.php
@@ -10,6 +10,7 @@
private $key;
private $icon;
+ private $color;
private $inputName;
private $value;
private $tokenType = self::TYPE_OBJECT;
@@ -20,6 +21,7 @@
return id(new PhabricatorTypeaheadTokenView())
->setKey($result->getPHID())
->setIcon($result->getIcon())
+ ->setColor($result->getColor())
->setValue($result->getDisplayName())
->setTokenType($result->getTokenType());
}
@@ -30,11 +32,13 @@
$token = id(new PhabricatorTypeaheadTokenView())
->setKey($handle->getPHID())
->setValue($handle->getFullName())
- ->setIcon(rtrim($handle->getIcon().' '.$handle->getIconColor()));
+ ->setIcon($handle->getIcon());
if ($handle->isDisabled() ||
$handle->getStatus() == PhabricatorObjectHandleStatus::STATUS_CLOSED) {
$token->setTokenType(self::TYPE_DISABLED);
+ } else {
+ $token->setColor($handle->getTagColor());
}
return $token;
@@ -76,6 +80,15 @@
return $this->icon;
}
+ public function setColor($color) {
+ $this->color = $color;
+ return $this;
+ }
+
+ public function getColor() {
+ return $this->color;
+ }
+
public function setValue($value) {
$this->value = $value;
return $this;
@@ -107,6 +120,8 @@
break;
}
+ $classes[] = $this->getColor();
+
return array(
'class' => $classes,
);
@@ -126,7 +141,7 @@
phutil_tag(
'span',
array(
- 'class' => 'phui-icon-view phui-font-fa bluetext '.$icon,
+ 'class' => 'phui-icon-view phui-font-fa '.$icon,
)),
$value,
);
diff --git a/src/applications/uiexample/examples/PHUITypeaheadExample.php b/src/applications/uiexample/examples/PHUITypeaheadExample.php
--- a/src/applications/uiexample/examples/PHUITypeaheadExample.php
+++ b/src/applications/uiexample/examples/PHUITypeaheadExample.php
@@ -24,8 +24,9 @@
->setIcon('fa-user');
$token_list[] = id(new PhabricatorTypeaheadTokenView())
- ->setValue(pht('Custom Object'))
- ->setIcon('fa-tag green');
+ ->setValue(pht('Object with Color'))
+ ->setIcon('fa-tag')
+ ->setColor('green');
$token_list[] = id(new PhabricatorTypeaheadTokenView())
->setValue(pht('Function Token'))
diff --git a/src/view/form/control/AphrontFormTokenizerControl.php b/src/view/form/control/AphrontFormTokenizerControl.php
--- a/src/view/form/control/AphrontFormTokenizerControl.php
+++ b/src/view/form/control/AphrontFormTokenizerControl.php
@@ -125,6 +125,7 @@
'value' => mpull($tokens, 'getValue', 'getKey'),
'icons' => mpull($tokens, 'getIcon', 'getKey'),
'types' => mpull($tokens, 'getTokenType', 'getKey'),
+ 'colors' => mpull($tokens, 'getColor', 'getKey'),
'limit' => $this->limit,
'username' => $username,
'placeholder' => $placeholder,
diff --git a/webroot/rsrc/js/core/Prefab.js b/webroot/rsrc/js/core/Prefab.js
--- a/webroot/rsrc/js/core/Prefab.js
+++ b/webroot/rsrc/js/core/Prefab.js
@@ -177,21 +177,27 @@
var icon;
var type;
+ var color;
if (result) {
icon = result.icon;
value = result.displayName;
type = result.tokenType;
+ color = result.color;
} else {
icon = config.icons[key];
type = config.types[key];
+ color = config.colors[key];
}
if (icon) {
icon = JX.Prefab._renderIcon(icon);
}
- if (type) {
- JX.DOM.alterClass(container, 'jx-tokenizer-token-' + type, true);
+ type = type || 'object';
+ JX.DOM.alterClass(container, 'jx-tokenizer-token-' + type, true);
+
+ if (color) {
+ JX.DOM.alterClass(container, color, true);
}
return [icon, value];
@@ -292,8 +298,9 @@
closed: closed,
type: fields[5],
sprite: fields[10],
- tokenType: fields[11],
- unique: fields[12] || false
+ color: fields[11],
+ tokenType: fields[12],
+ unique: fields[13] || false
};
},

File Metadata

Mime Type
text/plain
Expires
Fri, May 10, 12:11 AM (3 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6280867
Default Alt Text
D12467.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility