From 25c227ac04d129f3c4746dd480aa1c0f742985cf Mon Sep 17 00:00:00 2001 From: Aayush Date: Tue, 25 Mar 2014 23:05:52 +0530 Subject: [PATCH 1/5] complete patch for #4279 ctrl +up/down + ff issue Signed-off-by: Aayush Anand aayushism12@gmail.com --- js/keyhandler.js | 80 ++++++++++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/js/keyhandler.js b/js/keyhandler.js index a378249c7a..6e46677a3b 100644 --- a/js/keyhandler.js +++ b/js/keyhandler.js @@ -1,8 +1,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ -// gloabl vars to hold Arrow Down event timeStamps -var prevTimeStamp = 0; -var curTimeStamp = 0; +// gloabl vars that holds: 0- if ctrl key is not pressed 1- if ctrl key is pressed +var ctrlKeyHistory = 0; /** * Allows moving around inputs/select by Ctrl+arrows @@ -13,16 +12,6 @@ function onKeyDownArrowsHandler(e) { e = e || window.event; - curTimeStamp = e.timeStamp; - if( prevTimeStamp == 0 ) { - prevTimeStamp = curTimeStamp; - } - else if( Math.abs(curTimeStamp-prevTimeStamp) < 150 ) { - // event in a very quick succession - return; - } - prevTimeStamp = curTimeStamp; - var o = (e.srcElement || e.target); if (!o) { return; @@ -30,19 +19,31 @@ function onKeyDownArrowsHandler(e) if (o.tagName != "TEXTAREA" && o.tagName != "INPUT" && o.tagName != "SELECT") { return; } - if (navigator.userAgent.toLowerCase().indexOf('applewebkit/') != -1) { - if (e.ctrlKey || e.shiftKey || !e.altKey) { - return; - } - } else { - if (!e.ctrlKey || e.shiftKey || e.altKey) { - return; - } + if ((e.which != 17) && (e.which != 37) && (e.which != 38) && (e.which != 39) && (e.which !=40)) { + return; } if (!o.id) { return; } + if (e.type == "keyup") { + if (e.which==17) { + ctrlKeyHistory = 0; + } + return; + } + else if (e.type == "keydown") { + if (e.which == 17) { + ctrlKeyHistory = 1; + } + } + + if (ctrlKeyHistory != 1) { + return; + } + + e.preventDefault(); + var pos = o.id.split("_"); if (pos[0] != "field" || typeof pos[2] == "undefined") { return; @@ -75,11 +76,6 @@ function onKeyDownArrowsHandler(e) var is_firefox = navigator.userAgent.toLowerCase().indexOf("firefox/") > -1; - // restore selected index, bug #3799 - if (is_firefox && e.type == "keyup") { - o.selectedIndex = window["selectedIndex_" + o.id]; - } - var id = "field_" + y + "_" + x; nO = document.getElementById(id); if (! nO) { @@ -91,12 +87,36 @@ function onKeyDownArrowsHandler(e) if (! nO) { return; } - if (e.type == "keydown") { - nO.focus(); - if (is_firefox) { - window["selectedIndex_" + nO.id] = nO.selectedIndex; + + // for firefox select tag + var lvalue = o.selectedIndex; + var nOvalue = nO.selectedIndex; + + nO.focus(); + + if (is_firefox) { + var ffversion = '24'; + var is_firefox_v_24 = navigator.userAgent.toLowerCase().indexOf('firefox/'+ffversion) > -1; + if (is_firefox_v_24) { + if (e.which == 38 || e.which == 37) { + nOvalue++; + } + else if (e.which == 40 || e.which == 39) { + nOvalue--; + } + nO.selectedIndex=nOvalue; + } + else { + if (e.which == 38 || e.which == 37) { + lvalue++; + } + else if (e.which == 40 || e.which == 39) { + lvalue--; + } + o.selectedIndex=lvalue; } } + if (nO.tagName != 'SELECT') { nO.select(); } From e8315404e02e67dce96e3f20a80c25144ed853a6 Mon Sep 17 00:00:00 2001 From: Aayush Date: Thu, 27 Mar 2014 00:08:12 +0530 Subject: [PATCH 2/5] #4279 ctrl+up/down for all ff Signed-off-by: Aayush Anand --- js/keyhandler.js | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/js/keyhandler.js b/js/keyhandler.js index 6e46677a3b..220930763d 100644 --- a/js/keyhandler.js +++ b/js/keyhandler.js @@ -1,6 +1,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ -// gloabl vars that holds: 0- if ctrl key is not pressed 1- if ctrl key is pressed +// global var that holds: 0- if ctrl key is not pressed 1- if ctrl key is pressed var ctrlKeyHistory = 0; /** @@ -95,23 +95,30 @@ function onKeyDownArrowsHandler(e) nO.focus(); if (is_firefox) { - var ffversion = '24'; - var is_firefox_v_24 = navigator.userAgent.toLowerCase().indexOf('firefox/'+ffversion) > -1; - if (is_firefox_v_24) { + var ffcheck = 0; + var ffversion; + for (ffversion = 3 ; ffversion < 24 ; ffversion++) { + var is_firefox_v_24 = navigator.userAgent.toLowerCase().indexOf('firefox/'+ffversion) > -1; + if (is_firefox_v_24) { + ffcheck = 1; + break; + } + } + if (ffcheck == 1) { if (e.which == 38 || e.which == 37) { - nOvalue++; + nOvalue++; } else if (e.which == 40 || e.which == 39) { - nOvalue--; + nOvalue--; } nO.selectedIndex=nOvalue; } else { if (e.which == 38 || e.which == 37) { - lvalue++; + lvalue++; } else if (e.which == 40 || e.which == 39) { - lvalue--; + lvalue--; } o.selectedIndex=lvalue; } From d131cda6cb0cc16883fd4d55dfc3261d9d8e05f8 Mon Sep 17 00:00:00 2001 From: Aayush Date: Thu, 27 Mar 2014 00:22:08 +0530 Subject: [PATCH 3/5] complete patch for #4279 ctrl +up/down final Signed-off-by: Aayush Anand --- js/keyhandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/keyhandler.js b/js/keyhandler.js index 220930763d..65e78e85df 100644 --- a/js/keyhandler.js +++ b/js/keyhandler.js @@ -97,7 +97,7 @@ function onKeyDownArrowsHandler(e) if (is_firefox) { var ffcheck = 0; var ffversion; - for (ffversion = 3 ; ffversion < 24 ; ffversion++) { + for (ffversion = 3 ; ffversion < 25 ; ffversion++) { var is_firefox_v_24 = navigator.userAgent.toLowerCase().indexOf('firefox/'+ffversion) > -1; if (is_firefox_v_24) { ffcheck = 1; From 9b72244b65cb44a7da47a07fe08a63567394193f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 28 Mar 2014 08:26:35 -0400 Subject: [PATCH 4/5] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index f50de1a347..069d74d448 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.1.13.0 (not yet released) +- bug #4279 CTRL + up or down moves 2 fields 4.1.12.0 (2014-03-27) - bug #4334 Add event : datepicker won't open From 66f95ce4dce1bbfb5c699d825204ccfbbd4a6d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 28 Mar 2014 13:27:02 +0100 Subject: [PATCH 5/5] Translated using Weblate (Welsh) Currently translated at 23.5% (648 of 2750) --- po/cy.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/cy.po b/po/cy.po index df50ac2829..2e0d67ecd7 100644 --- a/po/cy.po +++ b/po/cy.po @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.13-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-03-27 13:53+0100\n" -"PO-Revision-Date: 2013-08-23 09:14+0200\n" +"PO-Revision-Date: 2014-03-28 13:27+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Welsh \n" +"Language-Team: Welsh \n" "Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" -"X-Generator: Weblate 1.7-dev\n" +"X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -3614,7 +3614,7 @@ msgstr "" #: libraries/TableSearch.class.php:821 libraries/insert_edit.lib.php:1238 #: libraries/server_privileges.lib.php:438 msgid "Or" -msgstr "Or" +msgstr "" #: libraries/TableSearch.class.php:822 msgid "Add search conditions (body of the \"where\" clause):"