Give tokenizer tokens CSS color classes on the container instead of the icon

Summary:
Ref T4100. See D12465.

  - Instead of putting CSS color classes on the tokenizer icons, put them on the container tags.
  - Note that this removes the "bluegrey" default classes.
  - This doesn't actually add CSS for the classes so, e.g., "green" doesn't make things green yet. This just supports D12465.

Test Plan: Viewed markup, saw classes.

Reviewers: chad

Reviewed By: chad

Subscribers: epriestley

Maniphest Tasks: T4100

Differential Revision: https://secure.phabricator.com/D12467
This commit is contained in:
epriestley
2015-04-19 07:17:54 -07:00
parent 2106a553e4
commit 8f61eb45ab
6 changed files with 46 additions and 10 deletions

View File

@@ -177,21 +177,27 @@ JX.install('Prefab', {
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 @@ JX.install('Prefab', {
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
};
},