revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-01 19:22:42 +01:00
Code Issues Releases Wiki Activity

Remove placeholder

Browse source 
Summary: See discussion in D3103. We don't need this for now; if we do in the future we should probably use an alternate implementation.

Test Plan: Grepped for 'placeholder', viewed UI examples.

Reviewers: vrana

Reviewed By: vrana

CC: aran

Maniphest Tasks: T1569

Differential Revision: https://secure.phabricator.com/D3115
This commit is contained in:
epriestley 2012-07-31 18:28:08 -07:00
parent 4b0d0f6e8b
commit 3cf0921682
4 changed files with 49 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
src/__celerity_resource_map__.php
View file

@ -1139,7 +1139,7 @@ celerity_register_resource_map(array(
), ),
'javelin-behavior-diffusion-commit-branches' => 'javelin-behavior-diffusion-commit-branches' =>
array( array(
'uri' => '/res/e6ae17a6/rsrc/js/application/diffusion/behavior-commit-branches.js', 'uri' => '/res/1ede335a/rsrc/js/application/diffusion/behavior-commit-branches.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -1516,17 +1516,6 @@ celerity_register_resource_map(array(
), ),
'disk' => '/rsrc/js/application/phriction/phriction-document-preview.js', 'disk' => '/rsrc/js/application/phriction/phriction-document-preview.js',
), ),
'javelin-behavior-placeholder' =>
array(
'uri' => '/res/7dc26990/rsrc/js/application/core/behavior-placeholder.js',
'type' => 'js',
'requires' =>
array(
0 => 'javelin-behavior',
1 => 'javelin-dom',
),
'disk' => '/rsrc/js/application/core/behavior-placeholder.js',
),
'javelin-behavior-projects-resource-editor' => 'javelin-behavior-projects-resource-editor' =>
array( array(
'uri' => '/res/ffdde7d9/rsrc/js/application/projects/projects-resource-editor.js', 'uri' => '/res/ffdde7d9/rsrc/js/application/projects/projects-resource-editor.js',
@ -1559,7 +1548,7 @@ celerity_register_resource_map(array(
), ),
'javelin-behavior-repository-crossreference' => 'javelin-behavior-repository-crossreference' =>
array( array(
'uri' => '/res/8e4bbed2/rsrc/js/application/repository/repository-crossreference.js', 'uri' => '/res/345ad6b3/rsrc/js/application/repository/repository-crossreference.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -2438,7 +2427,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-standard-page-view' => 'phabricator-standard-page-view' =>
array( array(
'uri' => '/res/4c0444c2/rsrc/css/application/base/standard-page-view.css', 'uri' => '/res/678262d4/rsrc/css/application/base/standard-page-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -2693,7 +2682,7 @@ celerity_register_resource_map(array(
), array( ), array(
'packages' => 'packages' =>
array( array(
'abce9c99' => 84072344 =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
'symbols' => 'symbols' =>
@ -2722,7 +2711,7 @@ celerity_register_resource_map(array(
21 => 'phabricator-flag-css', 21 => 'phabricator-flag-css',
22 => 'aphront-error-view-css', 22 => 'aphront-error-view-css',
), ),
'uri' => '/res/pkg/abce9c99/core.pkg.css', 'uri' => '/res/pkg/84072344/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'971b021e' => '971b021e' =>
@ -2773,7 +2762,7 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/96bc37d6/differential.pkg.css', 'uri' => '/res/pkg/96bc37d6/differential.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'f4bbbd84' => 'ffd90d51' =>
array( array(
'name' => 'differential.pkg.js', 'name' => 'differential.pkg.js',
'symbols' => 'symbols' =>
@ -2797,7 +2786,7 @@ celerity_register_resource_map(array(
16 => 'javelin-behavior-differential-dropdown-menus', 16 => 'javelin-behavior-differential-dropdown-menus',
17 => 'javelin-behavior-buoyant', 17 => 'javelin-behavior-buoyant',
), ),
'uri' => '/res/pkg/f4bbbd84/differential.pkg.js', 'uri' => '/res/pkg/ffd90d51/differential.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'c8ce2d88' => 'c8ce2d88' =>
@ -2889,23 +2878,23 @@ celerity_register_resource_map(array(
'reverse' => 'reverse' =>
array( array(
'aphront-attached-file-view-css' => '7839ae2d', 'aphront-attached-file-view-css' => '7839ae2d',
'aphront-crumbs-view-css' => 'abce9c99', 'aphront-crumbs-view-css' => '84072344',
'aphront-dialog-view-css' => 'abce9c99', 'aphront-dialog-view-css' => '84072344',
'aphront-error-view-css' => 'abce9c99', 'aphront-error-view-css' => '84072344',
'aphront-form-view-css' => 'abce9c99', 'aphront-form-view-css' => '84072344',
'aphront-headsup-action-list-view-css' => '96bc37d6', 'aphront-headsup-action-list-view-css' => '96bc37d6',
'aphront-headsup-view-css' => 'abce9c99', 'aphront-headsup-view-css' => '84072344',
'aphront-list-filter-view-css' => 'abce9c99', 'aphront-list-filter-view-css' => '84072344',
'aphront-pager-view-css' => 'abce9c99', 'aphront-pager-view-css' => '84072344',
'aphront-panel-view-css' => 'abce9c99', 'aphront-panel-view-css' => '84072344',
'aphront-side-nav-view-css' => 'abce9c99', 'aphront-side-nav-view-css' => '84072344',
'aphront-table-view-css' => 'abce9c99', 'aphront-table-view-css' => '84072344',
'aphront-tokenizer-control-css' => 'abce9c99', 'aphront-tokenizer-control-css' => '84072344',
'aphront-tooltip-css' => 'abce9c99', 'aphront-tooltip-css' => '84072344',
'aphront-typeahead-control-css' => 'abce9c99', 'aphront-typeahead-control-css' => '84072344',
'differential-changeset-view-css' => '96bc37d6', 'differential-changeset-view-css' => '96bc37d6',
'differential-core-view-css' => '96bc37d6', 'differential-core-view-css' => '96bc37d6',
'differential-inline-comment-editor' => 'f4bbbd84', 'differential-inline-comment-editor' => 'ffd90d51',
'differential-local-commits-view-css' => '96bc37d6', 'differential-local-commits-view-css' => '96bc37d6',
'differential-results-table-css' => '96bc37d6', 'differential-results-table-css' => '96bc37d6',
'differential-revision-add-comment-css' => '96bc37d6', 'differential-revision-add-comment-css' => '96bc37d6',
@ -2918,21 +2907,21 @@ celerity_register_resource_map(array(
'inline-comment-summary-css' => '96bc37d6', 'inline-comment-summary-css' => '96bc37d6',
'javelin-behavior' => '6fb20113', 'javelin-behavior' => '6fb20113',
'javelin-behavior-aphront-basic-tokenizer' => '97f65640', 'javelin-behavior-aphront-basic-tokenizer' => '97f65640',
'javelin-behavior-aphront-drag-and-drop' => 'f4bbbd84', 'javelin-behavior-aphront-drag-and-drop' => 'ffd90d51',
'javelin-behavior-aphront-drag-and-drop-textarea' => 'f4bbbd84', 'javelin-behavior-aphront-drag-and-drop-textarea' => 'ffd90d51',
'javelin-behavior-aphront-form-disable-on-submit' => '971b021e', 'javelin-behavior-aphront-form-disable-on-submit' => '971b021e',
'javelin-behavior-audit-preview' => '5e68be89', 'javelin-behavior-audit-preview' => '5e68be89',
'javelin-behavior-buoyant' => 'f4bbbd84', 'javelin-behavior-buoyant' => 'ffd90d51',
'javelin-behavior-differential-accept-with-errors' => 'f4bbbd84', 'javelin-behavior-differential-accept-with-errors' => 'ffd90d51',
'javelin-behavior-differential-add-reviewers-and-ccs' => 'f4bbbd84', 'javelin-behavior-differential-add-reviewers-and-ccs' => 'ffd90d51',
'javelin-behavior-differential-comment-jump' => 'f4bbbd84', 'javelin-behavior-differential-comment-jump' => 'ffd90d51',
'javelin-behavior-differential-diff-radios' => 'f4bbbd84', 'javelin-behavior-differential-diff-radios' => 'ffd90d51',
'javelin-behavior-differential-dropdown-menus' => 'f4bbbd84', 'javelin-behavior-differential-dropdown-menus' => 'ffd90d51',
'javelin-behavior-differential-edit-inline-comments' => 'f4bbbd84', 'javelin-behavior-differential-edit-inline-comments' => 'ffd90d51',
'javelin-behavior-differential-feedback-preview' => 'f4bbbd84', 'javelin-behavior-differential-feedback-preview' => 'ffd90d51',
'javelin-behavior-differential-keyboard-navigation' => 'f4bbbd84', 'javelin-behavior-differential-keyboard-navigation' => 'ffd90d51',
'javelin-behavior-differential-populate' => 'f4bbbd84', 'javelin-behavior-differential-populate' => 'ffd90d51',
'javelin-behavior-differential-show-more' => 'f4bbbd84', 'javelin-behavior-differential-show-more' => 'ffd90d51',
'javelin-behavior-diffusion-commit-graph' => '5e68be89', 'javelin-behavior-diffusion-commit-graph' => '5e68be89',
'javelin-behavior-diffusion-pull-lastmodified' => '5e68be89', 'javelin-behavior-diffusion-pull-lastmodified' => '5e68be89',
'javelin-behavior-maniphest-batch-selector' => '7707de41', 'javelin-behavior-maniphest-batch-selector' => '7707de41',
@ -2942,12 +2931,12 @@ celerity_register_resource_map(array(
'javelin-behavior-maniphest-transaction-preview' => '7707de41', 'javelin-behavior-maniphest-transaction-preview' => '7707de41',
'javelin-behavior-phabricator-autofocus' => '971b021e', 'javelin-behavior-phabricator-autofocus' => '971b021e',
'javelin-behavior-phabricator-keyboard-shortcuts' => '971b021e', 'javelin-behavior-phabricator-keyboard-shortcuts' => '971b021e',
'javelin-behavior-phabricator-object-selector' => 'f4bbbd84', 'javelin-behavior-phabricator-object-selector' => 'ffd90d51',
'javelin-behavior-phabricator-oncopy' => '971b021e', 'javelin-behavior-phabricator-oncopy' => '971b021e',
'javelin-behavior-phabricator-tooltips' => '971b021e', 'javelin-behavior-phabricator-tooltips' => '971b021e',
'javelin-behavior-phabricator-watch-anchor' => '971b021e', 'javelin-behavior-phabricator-watch-anchor' => '971b021e',
'javelin-behavior-refresh-csrf' => '971b021e', 'javelin-behavior-refresh-csrf' => '971b021e',
'javelin-behavior-repository-crossreference' => 'f4bbbd84', 'javelin-behavior-repository-crossreference' => 'ffd90d51',
'javelin-behavior-workflow' => '971b021e', 'javelin-behavior-workflow' => '971b021e',
'javelin-dom' => '6fb20113', 'javelin-dom' => '6fb20113',
'javelin-event' => '6fb20113', 'javelin-event' => '6fb20113',
@ -2968,15 +2957,15 @@ celerity_register_resource_map(array(
'javelin-workflow' => '971b021e', 'javelin-workflow' => '971b021e',
'maniphest-task-summary-css' => '7839ae2d', 'maniphest-task-summary-css' => '7839ae2d',
'maniphest-transaction-detail-css' => '7839ae2d', 'maniphest-transaction-detail-css' => '7839ae2d',
'phabricator-app-buttons-css' => 'abce9c99', 'phabricator-app-buttons-css' => '84072344',
'phabricator-content-source-view-css' => '96bc37d6', 'phabricator-content-source-view-css' => '96bc37d6',
'phabricator-core-buttons-css' => 'abce9c99', 'phabricator-core-buttons-css' => '84072344',
'phabricator-core-css' => 'abce9c99', 'phabricator-core-css' => '84072344',
'phabricator-directory-css' => 'abce9c99', 'phabricator-directory-css' => '84072344',
'phabricator-drag-and-drop-file-upload' => 'f4bbbd84', 'phabricator-drag-and-drop-file-upload' => 'ffd90d51',
'phabricator-dropdown-menu' => '971b021e', 'phabricator-dropdown-menu' => '971b021e',
'phabricator-flag-css' => 'abce9c99', 'phabricator-flag-css' => '84072344',
'phabricator-jump-nav' => 'abce9c99', 'phabricator-jump-nav' => '84072344',
'phabricator-keyboard-shortcut' => '971b021e', 'phabricator-keyboard-shortcut' => '971b021e',
'phabricator-keyboard-shortcut-manager' => '971b021e', 'phabricator-keyboard-shortcut-manager' => '971b021e',
'phabricator-menu-item' => '971b021e', 'phabricator-menu-item' => '971b021e',
@ -2984,11 +2973,11 @@ celerity_register_resource_map(array(
'phabricator-paste-file-upload' => '971b021e', 'phabricator-paste-file-upload' => '971b021e',
'phabricator-prefab' => '971b021e', 'phabricator-prefab' => '971b021e',
'phabricator-project-tag-css' => '7839ae2d', 'phabricator-project-tag-css' => '7839ae2d',
'phabricator-remarkup-css' => 'abce9c99', 'phabricator-remarkup-css' => '84072344',
'phabricator-shaped-request' => 'f4bbbd84', 'phabricator-shaped-request' => 'ffd90d51',
'phabricator-standard-page-view' => 'abce9c99', 'phabricator-standard-page-view' => '84072344',
'phabricator-tooltip' => '971b021e', 'phabricator-tooltip' => '971b021e',
'phabricator-transaction-view-css' => 'abce9c99', 'phabricator-transaction-view-css' => '84072344',
'syntax-highlighting-css' => 'abce9c99', 'syntax-highlighting-css' => '84072344',
), ),
)); ));

30
src/applications/uiexample/examples/JavelinUIExample.php
View file

@ -30,34 +30,6 @@ final class JavelinUIExample extends PhabricatorUIExample {
$request = $this->getRequest(); $request = $this->getRequest();
$user = $request->getUser(); $user = $request->getUser();
// placeholder
$placeholder_id = celerity_generate_unique_node_id();
Javelin::initBehavior(
'placeholder',
array(
'id' => $placeholder_id,
'text' => 'This is a placeholder',
));
$form = id(new AphrontFormView())
->setUser($user)
->appendChild(
id(new AphrontFormTextControl())
->setLabel('Placeholder')
->setID($placeholder_id))
->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Submit'));
$panel = new AphrontPanelView();
$panel->setHeader('A Form');
$panel->setWidth(AphrontPanelView::WIDTH_FORM);
$panel->appendChild($form);
// toggle-class // toggle-class
$container_id = celerity_generate_unique_node_id(); $container_id = celerity_generate_unique_node_id();
@ -105,6 +77,6 @@ final class JavelinUIExample extends PhabricatorUIExample {
), ),
$button_red.$button_blue); $button_red.$button_blue);
return array($panel, $div); return array($div);
} }
} }

8
webroot/rsrc/css/application/base/standard-page-view.css
View file

@ -119,11 +119,3 @@ a.handle-disabled {
cursor: pointer; cursor: pointer;
} }
/**
* Placeholder text added to inputs by the "placeholder" behavior.
*/
.jx-placeholder {
color: #888888;
}

60
webroot/rsrc/js/application/core/behavior-placeholder.js
View file

@ -1,60 +0,0 @@
/**
* @provides javelin-behavior-placeholder
* @requires javelin-behavior
* javelin-dom
*/
/**
* Add placeholder text to an input. Config are:
*
* - `id` (Required) ID of the element to add placeholder text to.
* - `text` (Required) Text to show.
*
* While the element is displaying placeholder text, the class `jx-placeholder`
* is added to it. Normally, you use a lower-contrast color to indicate that
* this text is instructional:
*
* .jx-placeholder {
* color: #888888;
* }
*
* @group ui
*/
JX.behavior('placeholder', function(config) {
var input = JX.$(config.id);
var placeholder_visible = false;
function update(show_placeholder) {
placeholder_visible = show_placeholder;
JX.DOM.alterClass(input, 'jx-placeholder', placeholder_visible);
}
function onfocus() {
if (placeholder_visible) {
input.value = '';
update(false);
}
}
function onblur() {
if (!input.value) {
input.value = config.text;
update(true);
}
}
JX.DOM.listen(input, 'focus', null, onfocus);
JX.DOM.listen(input, 'blur', null, onblur);
// When the user submits the form, remove the placeholder text (so it doesn't
// get submitted to the server) and then restore it after the submit finishes.
JX.DOM.listen(input.form, 'submit', null, function() {
onfocus();
setTimeout(onblur, 0);
});
// If the element isn't currently focused, show the placeholder text.
if (document.activeElement != input) {
onblur();
}
});