gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #150 from lem9/bug_3787

Browse Source 
Bug 3787
This commit is contained in:
Rouslan Placella 2013-02-03 06:11:22 -08:00
commit 6b9767cf34
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/keyhandler.js
View File

@ -4,6 +4,21 @@
*
* @param object event data
*/
AJAX.registerTeardown('keyhandler.js', function() {
$('#table_columns').die('keydown');
$('table.insertRowTable').die('keydown');
});
AJAX.registerOnload('keyhandler.js', function() {
$('#table_columns').live('keydown', function(event) {
onKeyDownArrowsHandler(event.originalEvent);
});
$('table.insertRowTable').live('keydown', function(event) {
onKeyDownArrowsHandler(event.originalEvent);
});
});
function onKeyDownArrowsHandler(e)
{
e = e||window.event;

1
libraries/Header.class.php
View File

@ -148,6 +148,7 @@ class PMA_Header
{
$this->_scripts->addFile('jquery/jquery-1.8.3.js');
$this->_scripts->addFile('ajax.js');
$this->_scripts->addFile('keyhandler.js');
$this->_scripts->addFile('jquery/jquery-ui-1.9.2.custom.js');
$this->_scripts->addFile('jquery/jquery.sprintf.js');
$this->_scripts->addFile('jquery/jquery.cookie.js');

7
libraries/tbl_columns_definition_form.inc.php
View File

@ -723,13 +723,6 @@ for ($i = 0; $i < $num_fields; $i++) {
}
} // end for
$html .= '<script src="js/keyhandler.js" type="text/javascript"></script>'
. '<script type="text/javascript">'
. '// <![CDATA['
. 'document.onkeydown = onKeyDownArrowsHandler;'
. '// ]]>'
. '</script>';
$html .= '<form method="post" action="' . $action . '" class="'
. ($action == 'tbl_create.php' ? 'create_table' : 'append_fields')
. '_form ajax">';

5
tbl_change.php
View File

@ -196,11 +196,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE'
// some browsers send wrongly this form to the http server.
$html_output = '';
//Set on key handler for moving using by Ctrl+arrows
$html_output .= '<script src="js/keyhandler.js" type="text/javascript"></script>'
. '<script type="text/javascript">'
. 'document.onkeydown = onKeyDownArrowsHandler;'
. '</script>';
// Set if we passed the first timestamp field
$timestamp_seen = false;
$columns_cnt = count($table_fields);