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

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-07-13 16:31:30 +05:30
commit 271b47956a
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -82,6 +82,7 @@ phpMyAdmin - ChangeLog
- bug Saved chart image does not have a proper name or an extension
- bug #4976 Timepicker CSS issues in Original theme
- bug #4975 Move/Copy/Rename operations on Table/Db fail on Drizzle server
- bug #4826 Two inline edit windows
4.4.11.0 (2015-07-06)
- bug Missing selected/entered values when editing active options in visual query builder

11
js/makegrid.js
View File

@ -995,21 +995,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if (typeof data !== 'undefined' && data.success === true) {
$td.data('original_data', data.value);
$(g.cEdit).find('.edit_box').val(data.value);
$editArea.append('<textarea></textarea>');
$editArea.find('textarea').val(data.value);
$editArea
.on('keyup', 'textarea', function (e) {
$(g.cEdit).find('.edit_box').val($(this).val());
});
$(g.cEdit).on('keyup', '.edit_box', function (e) {
$editArea.find('textarea').val($(this).val());
});
$editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
} else {
PMA_ajaxShowMessage(data.error, false);
}
}); // end $.post()
$editArea.show();
}
g.isEditCellTextEditable = true;
} else if ($td.is('.timefield, .datefield, .datetimefield, .timestampfield')) {