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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-06-18 14:07:16 +02:00
commit 726f647a34
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ajax.js
View File

@ -128,7 +128,7 @@ var AJAX = {
// leave the browser deal with it natively (e.g: file download)
// or leave an existing ajax event handler present elsewhere deal with it
var href = $(this).attr('href');
if (event.shiftKey || event.ctrlKey) {
if (typeof event != 'undefined' && (event.shiftKey || event.ctrlKey)) {
return true;
} else if ($(this).attr('target')) {
return true;

2
js/makegrid.js
View File

@ -1634,7 +1634,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
e.preventDefault();
// get the click count and increase
var clicks = $cell.data('clicks');
clicks = (clicks === null) ? 1 : clicks + 1;
clicks = (typeof clicks === 'undefined') ? 1 : clicks + 1;
if (clicks == 1) {
// if there are no previous clicks,