composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

run_query : replace JQuery.hotkeys by standard keys detection (#359)

Browse Source 
Use same technique as the one in #345
This commit is contained in:
Pierre Goiffon
2023-03-14 17:54:09 +01:00
committed by GitHub
parent 5d20b76476
commit c3816c9d0b
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/jquery.hotkeys.js
View File

@@ -1,6 +1,12 @@
/*jslint browser: true*/
/*jslint jquery: true*/
/**
* @deprecated 3.1.0 use JQuery event keys instead
* @link https://github.com/Combodo/iTop/pull/345 Ctrl+Enter shortcut added in iTop object forms
*/
/*
* jQuery Hotkeys Plugin
* Copyright 2010, John Resig

11
pages/run_query.php
View File

@@ -177,13 +177,14 @@ try
$oQueryTextArea->AddCSSClasses(['ibo-input-text', 'ibo-query-oql', 'ibo-is-code']);
$oQueryForm->AddSubBlock($oQueryTextArea);
$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot()."/js/jquery.hotkeys.js");
$oP->add_ready_script(<<<EOF
$oP->add_ready_script(<<<JS
$("#expression").select();
$("#expression").on("keydown", null, "ctrl+return", function() {
$(this).closest("form").submit();
$("#expression").on('keyup', function (oEvent) {
if ((oEvent.ctrlKey || oEvent.metaKey) && oEvent.key === 'Enter') {
$(this).closest('form').trigger('submit');
}
});
EOF
JS
);
if (count($aArgs) > 0) {

11
tests/php-unit-tests/legacy-tests/VerifyOQL.php
View File

@@ -158,13 +158,14 @@ try
$oP->add("<form method=\"post\">\n");
$oP->add(Dict::S('UI:RunQuery:ExpressionToEvaluate')."<br/>\n");
$oP->add("<textarea cols=\"120\" rows=\"8\" id=\"expression\" name=\"expression\">".utils::EscapeHtml($sExpression)."</textarea>\n");
$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot()."/js/jquery.hotkeys.js");
$oP->add_ready_script(<<<EOF
$oP->add_ready_script(<<<JS
$("#expression").select();
$("#expression").on("keydown", null, "ctrl+return", function() {
$(this).closest("form").submit();
$("#expression").on('keyup', function (oEvent) {
if ((oEvent.ctrlKey || oEvent.metaKey) && oEvent.key === 'Enter') {
$(this).closest('form').trigger('submit');
}
});
EOF
JS
);
if (count($aArgs) > 0)