1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-18 19:40:55 +01:00

Support placeholder text in Herald

Summary: Ref T4420. We don't currently pass placeholder text properly, but should.

Test Plan: Saw placeholder text in Herald.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T4420

Differential Revision: https://secure.phabricator.com/D9901
This commit is contained in:
epriestley 2014-07-17 15:55:43 -07:00
parent 962e60c561
commit 0e6756775c
3 changed files with 19 additions and 13 deletions

View file

@ -392,7 +392,7 @@ return array(
'rsrc/js/application/files/behavior-icon-composer.js' => '8ef9ab58',
'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
'rsrc/js/application/harbormaster/behavior-reorder-steps.js' => 'b716477f',
'rsrc/js/application/herald/HeraldRuleEditor.js' => '58e048fc',
'rsrc/js/application/herald/HeraldRuleEditor.js' => '3fc2c8f2',
'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
'rsrc/js/application/maniphest/behavior-batch-editor.js' => 'f588412e',
@ -543,7 +543,7 @@ return array(
'global-drag-and-drop-css' => '697324ad',
'harbormaster-css' => 'cec833b7',
'herald-css' => 'c544dd1c',
'herald-rule-editor' => '58e048fc',
'herald-rule-editor' => '3fc2c8f2',
'herald-test-css' => '778b008e',
'inline-comment-summary-css' => '8cfd34e8',
'javelin-aphlict' => '4a07e8e3',
@ -1103,6 +1103,15 @@ return array(
2 => 'javelin-stratcom',
3 => 'phabricator-tooltip',
),
'3fc2c8f2' => array(
0 => 'multirow-row-manager',
1 => 'javelin-install',
2 => 'javelin-util',
3 => 'javelin-dom',
4 => 'javelin-stratcom',
5 => 'javelin-json',
6 => 'phabricator-prefab',
),
'40a6a403' => array(
0 => 'javelin-install',
1 => 'javelin-dom',
@ -1199,15 +1208,6 @@ return array(
2 => 'javelin-vector',
3 => 'javelin-dom',
),
'58e048fc' => array(
0 => 'multirow-row-manager',
1 => 'javelin-install',
2 => 'javelin-util',
3 => 'javelin-dom',
4 => 'javelin-stratcom',
5 => 'javelin-json',
6 => 'phabricator-prefab',
),
'58f7803f' => array(
0 => 'javelin-behavior',
1 => 'javelin-aphlict',

View file

@ -601,7 +601,12 @@ final class HeraldRuleController extends HeraldController {
'userorproject' => new PhabricatorProjectOrUserDatasource(),
);
$sources = mpull($sources, 'getDatasourceURI');
foreach ($sources as $key => $source) {
$sources[$key] = array(
'uri' => $source->getDatasourceURI(),
'placeholder' => $source->getPlaceholderText(),
);
}
return array(
'source' => $sources,

View file

@ -283,7 +283,8 @@ JX.install('HeraldRuleEditor', {
var tokenizerConfig = {
root : template,
src : this._config.template.source[type],
src : this._config.template.source[type].uri,
placeholder: this._config.template.source[type].placeholder,
icons : this._config.template.icons,
username : this._config.username
};