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 2014-02-27 18:58:40 +01:00
commit 30cc87b2b0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/makegrid.js
View File

@ -799,6 +799,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
});
}
//reset the position of the edit_area div after closing datetime picker
$('.edit_area').css({'top' :'0','position':''});
if ($td.is('.relation')) {
//handle relations
$editArea.addClass('edit_area_loading');
@ -1708,9 +1711,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
}
});
$('html').click(function (e) {
// hide edit cell if the click is not from the datepicker
if ($(e.target).parents().index($('#ui-datepicker-div')) == -1) {
g.hideEditCell();
// hide edit cell if the click is not from the datepicker or edit area
if ($(e.target).parents().index($('#ui-datepicker-div')) == -1 && $(e.target).parents().index($('.cEdit .edit_area')) == -1){
g.hideEditCell();
}
}).keydown(function (e) {
if (e.which == 27 && g.isCellEditActive) {