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 2016-02-03 13:57:18 +01:00
commit 616f7d5b94
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/functions.js
View File

@ -44,11 +44,6 @@ var sql_autocomplete = false;
*/
var sql_autocomplete_default_table = '';
/**
* @var chart_activeTimeouts object active timeouts that refresh the charts. When disabling a realtime chart, this can be used to stop the continuous ajax requests
*/
var chart_activeTimeouts = {};
/**
* @var central_column_list array to hold the columns in central list per db.
*/

15
js/makegrid.js
View File

@ -1405,7 +1405,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
* @var is_null String capturing whether 'checkbox_null_<field_name>_<row_index>' is checked.
*/
var is_null = $(g.cEdit).find('input:checkbox').is(':checked');
var value;
if ($(g.cEdit).find('.edit_area').is('.edit_area_loading')) {
// the edit area is still loading (retrieving cell data), no need to post
@ -1579,14 +1578,14 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
g.dragStartReorder(e, this);
}
})
.mouseenter(function (e) {
.mouseenter(function () {
if (g.visibleHeadersCount > 1) {
$(this).css('cursor', 'move');
} else {
$(this).css('cursor', 'inherit');
}
})
.mouseleave(function (e) {
.mouseleave(function () {
g.showReorderHint = false;
$(this).tooltip("option", {
content: g.updateHint()
@ -2028,7 +2027,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$(g.cEditStd).on('keydown', 'input.edit_box, select', handleCtrlNavigation);
$(g.cEditStd).find('.edit_box').focus(function (e) {
$(g.cEditStd).find('.edit_box').focus(function () {
g.showEditArea();
});
$(g.cEditStd).on('keydown', '.edit_box, select', function (e) {
@ -2047,7 +2046,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$(g.cEditTextarea).on('keydown', 'textarea.edit_box, select', handleCtrlNavigation);
$(g.cEditTextarea).find('.edit_box').focus(function (e) {
$(g.cEditTextarea).find('.edit_box').focus(function () {
g.showEditArea();
});
$(g.cEditTextarea).on('keydown', '.edit_box, select', function (e) {
@ -2082,7 +2081,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
g.hideEditCell();
g.postEditedCell();
});
$(window).bind('beforeunload', function (e) {
$(window).bind('beforeunload', function () {
if (g.isCellEdited) {
return g.saveCellWarning;
}
@ -2199,14 +2198,14 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
// register events for hint tooltip (anchors inside draggable th)
$(t).find('th.draggable a')
.mouseenter(function (e) {
.mouseenter(function () {
g.showSortHint = true;
g.showMultiSortHint = true;
$(t).find("th.draggable").tooltip("option", {
content: g.updateHint()
});
})
.mouseleave(function (e) {
.mouseleave(function () {
g.showSortHint = false;
g.showMultiSortHint = false;
$(t).find("th.draggable").tooltip("option", {

1
js/tbl_structure.js
View File

@ -93,7 +93,6 @@ AJAX.registerOnload('tbl_structure.js', function () {
// Re-initialize variables.
primary_indexes = [];
unique_indexes = [];
indexes = [];
fulltext_indexes = [];
spatial_indexes = [];