revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-09-20 01:08:50 +02:00
Code Issues Releases Wiki Activity

Make control + enter submit forms if a textarea is focused

Browse source 
Summary:
This is straightforward, except that `form.submit()` does not call onsubmit handlers. Create a `didSyntheticSubmit` event and have everything which listens for form submits listen for it too.

Fixes T704.

Test Plan: Hit control + enter in inline comments, main commetns, Pholio, conpherence. Verified it triggered appropriate JS (workflow / special behaviors).

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T704

Differential Revision: https://secure.phabricator.com/D4704
This commit is contained in:
epriestley 2013-01-28 14:11:32 -08:00
parent bb74573117
commit bc5617954a
5 changed files with 121 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
src/__celerity_resource_map__.php
View file

@ -797,7 +797,7 @@ celerity_register_resource_map(array(
), ),
'differential-inline-comment-editor' => 'differential-inline-comment-editor' =>
array( array(
'uri' => '/res/1bc649b7/rsrc/js/application/differential/DifferentialInlineCommentEditor.js', 'uri' => '/res/e0ad34ac/rsrc/js/application/differential/DifferentialInlineCommentEditor.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -1057,7 +1057,7 @@ celerity_register_resource_map(array(
), ),
'javelin-behavior-aphront-form-disable-on-submit' => 'javelin-behavior-aphront-form-disable-on-submit' =>
array( array(
'uri' => '/res/ca54e8b9/rsrc/js/application/core/behavior-form.js', 'uri' => '/res/f5cb51f1/rsrc/js/application/core/behavior-form.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -1796,7 +1796,7 @@ celerity_register_resource_map(array(
), ),
'javelin-behavior-phabricator-transaction-list' => 'javelin-behavior-phabricator-transaction-list' =>
array( array(
'uri' => '/res/307a71af/rsrc/js/application/transactions/behavior-transaction-list.js', 'uri' => '/res/f1fbb474/rsrc/js/application/transactions/behavior-transaction-list.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -1963,7 +1963,7 @@ celerity_register_resource_map(array(
), ),
'javelin-behavior-workflow' => 'javelin-behavior-workflow' =>
array( array(
'uri' => '/res/2b0e2754/rsrc/js/application/core/behavior-workflow.js', 'uri' => '/res/2c99beaf/rsrc/js/application/core/behavior-workflow.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -3404,7 +3404,7 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/5f46c4fd/core.pkg.css', 'uri' => '/res/pkg/5f46c4fd/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'66dca903' => '4bf2be0a' =>
array( array(
'name' => 'core.pkg.js', 'name' => 'core.pkg.js',
'symbols' => 'symbols' =>
@ -3443,7 +3443,7 @@ celerity_register_resource_map(array(
31 => 'javelin-behavior-global-drag-and-drop', 31 => 'javelin-behavior-global-drag-and-drop',
32 => 'javelin-behavior-phabricator-home-reveal-tiles', 32 => 'javelin-behavior-phabricator-home-reveal-tiles',
), ),
'uri' => '/res/pkg/66dca903/core.pkg.js', 'uri' => '/res/pkg/4bf2be0a/core.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'8edbada5' => '8edbada5' =>
@ -3481,7 +3481,7 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/ec01d039/differential.pkg.css', 'uri' => '/res/pkg/ec01d039/differential.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'310cd201' => '9dae5f20' =>
array( array(
'name' => 'differential.pkg.js', 'name' => 'differential.pkg.js',
'symbols' => 'symbols' =>
@ -3506,7 +3506,7 @@ celerity_register_resource_map(array(
17 => 'javelin-behavior-differential-toggle-files', 17 => 'javelin-behavior-differential-toggle-files',
18 => 'javelin-behavior-differential-user-select', 18 => 'javelin-behavior-differential-user-select',
), ),
'uri' => '/res/pkg/310cd201/differential.pkg.js', 'uri' => '/res/pkg/9dae5f20/differential.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'c8ce2d88' => 'c8ce2d88' =>
@ -3606,7 +3606,7 @@ celerity_register_resource_map(array(
'aphront-typeahead-control-css' => '5f46c4fd', 'aphront-typeahead-control-css' => '5f46c4fd',
'differential-changeset-view-css' => 'ec01d039', 'differential-changeset-view-css' => 'ec01d039',
'differential-core-view-css' => 'ec01d039', 'differential-core-view-css' => 'ec01d039',
'differential-inline-comment-editor' => '310cd201', 'differential-inline-comment-editor' => '9dae5f20',
'differential-local-commits-view-css' => 'ec01d039', 'differential-local-commits-view-css' => 'ec01d039',
'differential-results-table-css' => 'ec01d039', 'differential-results-table-css' => 'ec01d039',
'differential-revision-add-comment-css' => 'ec01d039', 'differential-revision-add-comment-css' => 'ec01d039',
@ -3619,56 +3619,56 @@ celerity_register_resource_map(array(
'diffusion-icons-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88',
'global-drag-and-drop-css' => '5f46c4fd', 'global-drag-and-drop-css' => '5f46c4fd',
'inline-comment-summary-css' => 'ec01d039', 'inline-comment-summary-css' => 'ec01d039',
'javelin-aphlict' => '66dca903', 'javelin-aphlict' => '4bf2be0a',
'javelin-behavior' => 'fbeded59', 'javelin-behavior' => 'fbeded59',
'javelin-behavior-aphlict-dropdown' => '66dca903', 'javelin-behavior-aphlict-dropdown' => '4bf2be0a',
'javelin-behavior-aphlict-listen' => '66dca903', 'javelin-behavior-aphlict-listen' => '4bf2be0a',
'javelin-behavior-aphront-basic-tokenizer' => '66dca903', 'javelin-behavior-aphront-basic-tokenizer' => '4bf2be0a',
'javelin-behavior-aphront-drag-and-drop' => '310cd201', 'javelin-behavior-aphront-drag-and-drop' => '9dae5f20',
'javelin-behavior-aphront-drag-and-drop-textarea' => '310cd201', 'javelin-behavior-aphront-drag-and-drop-textarea' => '9dae5f20',
'javelin-behavior-aphront-form-disable-on-submit' => '66dca903', 'javelin-behavior-aphront-form-disable-on-submit' => '4bf2be0a',
'javelin-behavior-audit-preview' => 'f96657b8', 'javelin-behavior-audit-preview' => 'f96657b8',
'javelin-behavior-dark-console' => '8edbada5', 'javelin-behavior-dark-console' => '8edbada5',
'javelin-behavior-dark-console-ajax' => '8edbada5', 'javelin-behavior-dark-console-ajax' => '8edbada5',
'javelin-behavior-device' => '66dca903', 'javelin-behavior-device' => '4bf2be0a',
'javelin-behavior-differential-accept-with-errors' => '310cd201', 'javelin-behavior-differential-accept-with-errors' => '9dae5f20',
'javelin-behavior-differential-add-reviewers-and-ccs' => '310cd201', 'javelin-behavior-differential-add-reviewers-and-ccs' => '9dae5f20',
'javelin-behavior-differential-comment-jump' => '310cd201', 'javelin-behavior-differential-comment-jump' => '9dae5f20',
'javelin-behavior-differential-diff-radios' => '310cd201', 'javelin-behavior-differential-diff-radios' => '9dae5f20',
'javelin-behavior-differential-dropdown-menus' => '310cd201', 'javelin-behavior-differential-dropdown-menus' => '9dae5f20',
'javelin-behavior-differential-edit-inline-comments' => '310cd201', 'javelin-behavior-differential-edit-inline-comments' => '9dae5f20',
'javelin-behavior-differential-feedback-preview' => '310cd201', 'javelin-behavior-differential-feedback-preview' => '9dae5f20',
'javelin-behavior-differential-keyboard-navigation' => '310cd201', 'javelin-behavior-differential-keyboard-navigation' => '9dae5f20',
'javelin-behavior-differential-populate' => '310cd201', 'javelin-behavior-differential-populate' => '9dae5f20',
'javelin-behavior-differential-show-more' => '310cd201', 'javelin-behavior-differential-show-more' => '9dae5f20',
'javelin-behavior-differential-toggle-files' => '310cd201', 'javelin-behavior-differential-toggle-files' => '9dae5f20',
'javelin-behavior-differential-user-select' => '310cd201', 'javelin-behavior-differential-user-select' => '9dae5f20',
'javelin-behavior-diffusion-commit-graph' => 'f96657b8', 'javelin-behavior-diffusion-commit-graph' => 'f96657b8',
'javelin-behavior-diffusion-pull-lastmodified' => 'f96657b8', 'javelin-behavior-diffusion-pull-lastmodified' => 'f96657b8',
'javelin-behavior-error-log' => '8edbada5', 'javelin-behavior-error-log' => '8edbada5',
'javelin-behavior-global-drag-and-drop' => '66dca903', 'javelin-behavior-global-drag-and-drop' => '4bf2be0a',
'javelin-behavior-konami' => '66dca903', 'javelin-behavior-konami' => '4bf2be0a',
'javelin-behavior-lightbox-attachments' => '66dca903', 'javelin-behavior-lightbox-attachments' => '4bf2be0a',
'javelin-behavior-maniphest-batch-selector' => '7707de41', 'javelin-behavior-maniphest-batch-selector' => '7707de41',
'javelin-behavior-maniphest-subpriority-editor' => '7707de41', 'javelin-behavior-maniphest-subpriority-editor' => '7707de41',
'javelin-behavior-maniphest-transaction-controls' => '7707de41', 'javelin-behavior-maniphest-transaction-controls' => '7707de41',
'javelin-behavior-maniphest-transaction-expand' => '7707de41', 'javelin-behavior-maniphest-transaction-expand' => '7707de41',
'javelin-behavior-maniphest-transaction-preview' => '7707de41', 'javelin-behavior-maniphest-transaction-preview' => '7707de41',
'javelin-behavior-phabricator-active-nav' => '66dca903', 'javelin-behavior-phabricator-active-nav' => '4bf2be0a',
'javelin-behavior-phabricator-autofocus' => '66dca903', 'javelin-behavior-phabricator-autofocus' => '4bf2be0a',
'javelin-behavior-phabricator-home-reveal-tiles' => '66dca903', 'javelin-behavior-phabricator-home-reveal-tiles' => '4bf2be0a',
'javelin-behavior-phabricator-keyboard-shortcuts' => '66dca903', 'javelin-behavior-phabricator-keyboard-shortcuts' => '4bf2be0a',
'javelin-behavior-phabricator-nav' => '66dca903', 'javelin-behavior-phabricator-nav' => '4bf2be0a',
'javelin-behavior-phabricator-object-selector' => '310cd201', 'javelin-behavior-phabricator-object-selector' => '9dae5f20',
'javelin-behavior-phabricator-oncopy' => '66dca903', 'javelin-behavior-phabricator-oncopy' => '4bf2be0a',
'javelin-behavior-phabricator-remarkup-assist' => '66dca903', 'javelin-behavior-phabricator-remarkup-assist' => '4bf2be0a',
'javelin-behavior-phabricator-search-typeahead' => '66dca903', 'javelin-behavior-phabricator-search-typeahead' => '4bf2be0a',
'javelin-behavior-phabricator-tooltips' => '66dca903', 'javelin-behavior-phabricator-tooltips' => '4bf2be0a',
'javelin-behavior-phabricator-watch-anchor' => '66dca903', 'javelin-behavior-phabricator-watch-anchor' => '4bf2be0a',
'javelin-behavior-refresh-csrf' => '66dca903', 'javelin-behavior-refresh-csrf' => '4bf2be0a',
'javelin-behavior-repository-crossreference' => '310cd201', 'javelin-behavior-repository-crossreference' => '9dae5f20',
'javelin-behavior-toggle-class' => '66dca903', 'javelin-behavior-toggle-class' => '4bf2be0a',
'javelin-behavior-workflow' => '66dca903', 'javelin-behavior-workflow' => '4bf2be0a',
'javelin-dom' => 'fbeded59', 'javelin-dom' => 'fbeded59',
'javelin-event' => 'fbeded59', 'javelin-event' => 'fbeded59',
'javelin-install' => 'fbeded59', 'javelin-install' => 'fbeded59',
@ -3690,39 +3690,39 @@ celerity_register_resource_map(array(
'lightbox-attachment-css' => '5f46c4fd', 'lightbox-attachment-css' => '5f46c4fd',
'maniphest-task-summary-css' => 'e30a3fa8', 'maniphest-task-summary-css' => 'e30a3fa8',
'maniphest-transaction-detail-css' => 'e30a3fa8', 'maniphest-transaction-detail-css' => 'e30a3fa8',
'phabricator-busy' => '66dca903', 'phabricator-busy' => '4bf2be0a',
'phabricator-content-source-view-css' => 'ec01d039', 'phabricator-content-source-view-css' => 'ec01d039',
'phabricator-core-buttons-css' => '5f46c4fd', 'phabricator-core-buttons-css' => '5f46c4fd',
'phabricator-core-css' => '5f46c4fd', 'phabricator-core-css' => '5f46c4fd',
'phabricator-crumbs-view-css' => '5f46c4fd', 'phabricator-crumbs-view-css' => '5f46c4fd',
'phabricator-directory-css' => '5f46c4fd', 'phabricator-directory-css' => '5f46c4fd',
'phabricator-drag-and-drop-file-upload' => '310cd201', 'phabricator-drag-and-drop-file-upload' => '9dae5f20',
'phabricator-dropdown-menu' => '66dca903', 'phabricator-dropdown-menu' => '4bf2be0a',
'phabricator-file-upload' => '66dca903', 'phabricator-file-upload' => '4bf2be0a',
'phabricator-filetree-view-css' => '5f46c4fd', 'phabricator-filetree-view-css' => '5f46c4fd',
'phabricator-flag-css' => '5f46c4fd', 'phabricator-flag-css' => '5f46c4fd',
'phabricator-form-view-css' => '5f46c4fd', 'phabricator-form-view-css' => '5f46c4fd',
'phabricator-header-view-css' => '5f46c4fd', 'phabricator-header-view-css' => '5f46c4fd',
'phabricator-jump-nav' => '5f46c4fd', 'phabricator-jump-nav' => '5f46c4fd',
'phabricator-keyboard-shortcut' => '66dca903', 'phabricator-keyboard-shortcut' => '4bf2be0a',
'phabricator-keyboard-shortcut-manager' => '66dca903', 'phabricator-keyboard-shortcut-manager' => '4bf2be0a',
'phabricator-main-menu-view' => '5f46c4fd', 'phabricator-main-menu-view' => '5f46c4fd',
'phabricator-menu-item' => '66dca903', 'phabricator-menu-item' => '4bf2be0a',
'phabricator-nav-view-css' => '5f46c4fd', 'phabricator-nav-view-css' => '5f46c4fd',
'phabricator-notification' => '66dca903', 'phabricator-notification' => '4bf2be0a',
'phabricator-notification-css' => '5f46c4fd', 'phabricator-notification-css' => '5f46c4fd',
'phabricator-notification-menu-css' => '5f46c4fd', 'phabricator-notification-menu-css' => '5f46c4fd',
'phabricator-object-item-list-view-css' => '5f46c4fd', 'phabricator-object-item-list-view-css' => '5f46c4fd',
'phabricator-object-selector-css' => 'ec01d039', 'phabricator-object-selector-css' => 'ec01d039',
'phabricator-paste-file-upload' => '66dca903', 'phabricator-paste-file-upload' => '4bf2be0a',
'phabricator-prefab' => '66dca903', 'phabricator-prefab' => '4bf2be0a',
'phabricator-project-tag-css' => 'e30a3fa8', 'phabricator-project-tag-css' => 'e30a3fa8',
'phabricator-remarkup-css' => '5f46c4fd', 'phabricator-remarkup-css' => '5f46c4fd',
'phabricator-shaped-request' => '310cd201', 'phabricator-shaped-request' => '9dae5f20',
'phabricator-side-menu-view-css' => '5f46c4fd', 'phabricator-side-menu-view-css' => '5f46c4fd',
'phabricator-standard-page-view' => '5f46c4fd', 'phabricator-standard-page-view' => '5f46c4fd',
'phabricator-textareautils' => '66dca903', 'phabricator-textareautils' => '4bf2be0a',
'phabricator-tooltip' => '66dca903', 'phabricator-tooltip' => '4bf2be0a',
'phabricator-transaction-view-css' => '5f46c4fd', 'phabricator-transaction-view-css' => '5f46c4fd',
'phabricator-zindex-css' => '5f46c4fd', 'phabricator-zindex-css' => '5f46c4fd',
'sprite-apps-large-css' => '5f46c4fd', 'sprite-apps-large-css' => '5f46c4fd',

44
webroot/rsrc/js/application/core/behavior-form.js
View file

@ -14,6 +14,39 @@ JX.behavior('aphront-form-disable-on-submit', function(config) {
new_tab = (raw.altKey || raw.ctrlKey || raw.metaKey || raw.shiftKey); new_tab = (raw.altKey || raw.ctrlKey || raw.metaKey || raw.shiftKey);
}); });
JX.Stratcom.listen('keypress', ['tag:form', 'tag:textarea'], function(e) {
var raw = e.getRawEvent();
if (e.getSpecialKey() != 'return' || !raw.ctrlKey) {
return;
}
e.kill();
var form = e.getNode('tag:form');
// This allows 'workflow' and similar actions to take effect.
var r = JX.DOM.invoke(form, 'didSyntheticSubmit');
if (r.getPrevented()) {
return;
}
// If nothing handled the synthetic submit, submit normally.
form.submit();
});
function will_submit(root) {
root._disabled = true;
var buttons = JX.DOM.scry(root, 'button');
for (var ii = 0; ii < buttons.length; ii++) {
if (!buttons[ii].disabled) {
buttons[ii].disabled = 'disabled';
JX.DOM.alterClass(buttons[ii], 'disabled', true);
restore.push(buttons[ii]);
}
}
}
JX.Stratcom.listen('submit', 'tag:form', function(e) { JX.Stratcom.listen('submit', 'tag:form', function(e) {
if (e.getNode('workflow')) { if (e.getNode('workflow')) {
// Don't activate for forms with workflow, the workflow behavior will // Don't activate for forms with workflow, the workflow behavior will
@ -34,15 +67,8 @@ JX.behavior('aphront-form-disable-on-submit', function(config) {
if (root._disabled) { if (root._disabled) {
e.kill(); e.kill();
} }
root._disabled = true;
var buttons = JX.DOM.scry(root, 'button'); will_submit(root);
for (var ii = 0; ii < buttons.length; ii++) {
if (!buttons[ii].disabled) {
buttons[ii].disabled = 'disabled';
JX.DOM.alterClass(buttons[ii], 'disabled', true);
restore.push(buttons[ii]);
}
}
}); });
JX.Stratcom.listen('unload', null, function(e) { JX.Stratcom.listen('unload', null, function(e) {

6
webroot/rsrc/js/application/core/behavior-workflow.js
View file

@ -7,8 +7,10 @@
*/ */
JX.behavior('workflow', function() { JX.behavior('workflow', function() {
// Listen for both real
JX.Stratcom.listen( JX.Stratcom.listen(
'submit', ['submit', 'didSyntheticSubmit'],
['workflow', 'tag:form'], ['workflow', 'tag:form'],
function(e) { function(e) {
if (JX.Stratcom.pass()) { if (JX.Stratcom.pass()) {
@ -18,6 +20,7 @@ JX.behavior('workflow', function() {
e.prevent(); e.prevent();
JX.Workflow.newFromForm(target).start(); JX.Workflow.newFromForm(target).start();
}); });
JX.Stratcom.listen( JX.Stratcom.listen(
'click', 'click',
['workflow', 'tag:a'], ['workflow', 'tag:a'],
@ -40,4 +43,5 @@ JX.behavior('workflow', function() {
e.prevent(); e.prevent();
JX.Workflow.newFromLink(target).start(); JX.Workflow.newFromLink(target).start();
}); });
}); });

6
webroot/rsrc/js/application/differential/DifferentialInlineCommentEditor.js
View file

@ -119,7 +119,11 @@ JX.install('DifferentialInlineCommentEditor', {
JX.DOM.alterClass(drawn[0], 'differential-inline-loading', true); JX.DOM.alterClass(drawn[0], 'differential-inline-loading', true);
}); });
JX.DOM.listen(drawn[0], 'submit', 'inline-edit-form', onsubmit); JX.DOM.listen(
drawn[0],
['submit', 'didSyntheticSubmit'],
'inline-edit-form',
onsubmit);
}, },
_didCompleteWorkflow : function(response) { _didCompleteWorkflow : function(response) {
var op = this.getOperation(); var op = this.getOperation();

29
webroot/rsrc/js/application/transactions/behavior-transaction-list.js
View file

@ -75,21 +75,24 @@ JX.behavior('phabricator-transaction-list', function(config) {
e.kill(); e.kill();
}); });
JX.Stratcom.listen('submit', 'transaction-append', function(e) { JX.Stratcom.listen(
var form = e.getTarget(); ['submit', 'didSyntheticSubmit'],
'transaction-append',
function(e) {
var form = e.getTarget();
JX.Workflow.newFromForm(form, {anchor: next_anchor}) JX.Workflow.newFromForm(form, {anchor: next_anchor})
.setHandler(function(response) { .setHandler(function(response) {
ontransactions(response); ontransactions(response);
var e = JX.DOM.invoke(form, 'willClear'); var e = JX.DOM.invoke(form, 'willClear');
if (!e.getPrevented()) { if (!e.getPrevented()) {
form.reset(); form.reset();
} }
}) })
.start(); .start();
e.kill(); e.kill();
}); });
}); });