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-01-04 07:26:14 +01:00
commit bd5989aa78
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/makegrid.js
View File

@ -194,6 +194,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
g.reposDrop();
g.colRsz = false;
$(g.cRsz).find('div').removeClass('colborder_active');
if($('#sticky_columns').length !== 0) {
rearrangeStickyColumns();
}
} else if (g.colReorder) {
// shift columns
if (g.colReorder.newn != g.colReorder.n) {
@ -220,6 +223,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$(g.cPointer).css('visibility', 'hidden');
g.colReorder = false;
if($('#sticky_columns').length !== 0) {
rearrangeStickyColumns();
}
}
$(document.body).css('cursor', 'inherit').noSelect(false);
},

24
js/sql.js
View File

@ -161,6 +161,7 @@ AJAX.registerOnload('sql.js', function () {
}
//add sticky columns div
initStickyColumns();
rearrangeStickyColumns();
//adjust sticky columns on scroll
$(window).bind('scroll', function() {
handleStickyColumns();
@ -533,6 +534,21 @@ function initStickyColumns() {
}
}
/*
* Arrange/Rearrange columns in sticky header
*/
function rearrangeStickyColumns() {
var $sticky_columns = $("#sticky_columns");
var $originalHeader = $("#table_results > thead");
var $originalColumns = $originalHeader.find("tr:first").children();
var $clonedHeader = $originalHeader.clone();
// clone width per cell
$clonedHeader.find("tr:first").children().width(function(i,val) {
return $originalColumns.eq(i).width();
});
$sticky_columns.empty().append($clonedHeader);
}
/*
* Adjust sticky columns on horizontal/vertical scroll
*/
@ -556,14 +572,6 @@ function handleStickyColumns() {
}
$sticky_columns.show();
} else {
var $originalHeader = $("#table_results > thead");
var $originalColumns = $originalHeader.find("tr:first").children();
var $clonedHeader = $originalHeader.clone();
// clone width per cell
$clonedHeader.find("tr:first").children().width(function(i,val) {
return $originalColumns.eq(i).width();
});
$sticky_columns.empty().append($clonedHeader);
$sticky_columns.hide();
}
}