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:
Pootle server 2011-07-15 14:40:08 +02:00
commit 7baf545df1
4 changed files with 79 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/functions.js
View File

@ -2837,3 +2837,42 @@ $(document).ready(function() {
}; //end noSelect
})(jQuery);
/**
* Create default PMA tooltip for the element specified. The default appearance
* can be overriden by specifying optional "options" parameter (see qTip options).
*/
function PMA_createqTip($elements, content, options) {
var o = {
content: content,
style: {
background: '#333',
border: {
radius: 5
},
fontSize: '0.8em',
padding: '0 0.5em',
name: 'dark'
},
position: {
target: 'mouse',
corner: { target: 'rightMiddle', tooltip: 'leftMiddle' },
adjust: { x: 20 }
},
show: {
delay: 0,
effect: {
type: 'grow',
length: 100
}
},
hide: {
effect: {
type: 'grow',
length: 150
}
}
}
$elements.qtip($.extend(true, o, options));
}

2
js/jquery/jquery.qtip-1.0.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

98
js/makegrid.js
View File

@ -10,17 +10,16 @@
colOrder: new Array(), // array of column order
colVisib: new Array(), // array of column visibility
tableCreateTime: null, // table creation time, only available in "Browse tab"
hintShown: false, // true if hint balloon is shown, used by updateHint() method
qtip: null, // qtip API
reorderHint: '', // string, hint for column reordering
sortHint: '', // string, hint for column sorting
markHint: '', // string, hint for column marking
colVisibHint: '', // string, hint for column visibility drop-down
showAllColText: '', // string, text for "show all" button under column visibility list
showReorderHint: false,
showSortHint: false,
showMarkHint: false,
showColVisibHint: false,
hintIsHiding: false, // true when hint is still shown, but hideHint() already called
showAllColText: '', // string, text for "show all" button under column visibility list
visibleHeadersCount: 0, // number of visible data headers
// functions
@ -63,8 +62,8 @@
objTop: objPos.top,
objLeft: objPos.left
};
this.qtip.hide();
$('body').css('cursor', 'move');
this.hideHint();
$('body').noSelect();
},
@ -166,7 +165,7 @@
*/
reposRsz: function() {
$(this.cRsz).find('div').hide();
$firstRowCols = $(this.t).find('tr:first th.draggable:visible');
var $firstRowCols = $(this.t).find('tr:first th.draggable:visible');
for (var n = 0; n < $firstRowCols.length; n++) {
$this = $($firstRowCols[n]);
$cb = $(g.cRsz).find('div:eq(' + n + ')'); // column border
@ -301,9 +300,10 @@
},
/**
* Show hint with the text supplied.
* Update current hint using the boolean values (showReorderHint, showSortHint, etc.).
* It will hide the hint if all the boolean values is false.
*/
showHint: function(e) {
updateHint: function(e) {
if (!this.colRsz && !this.colMov) { // if not resizing or dragging
var text = '';
if (this.showReorderHint && this.reorderHint) {
@ -325,53 +325,14 @@
}
// hide the hint if no text
if (!text) {
this.hideHint();
return;
}
this.qtip.disable(!text && e.type == 'mouseenter');
$(this.dHint).html(text);
if (!this.hintShown || this.hintIsHiding) {
$(this.dHint)
.stop(true, true)
.css({
top: e.clientY,
left: e.clientX + 15
})
.show('fast');
this.hintShown = true;
this.hintIsHiding = false;
}
this.qtip.updateContent(text, false);
} else {
this.qtip.disable(true);
}
},
/**
* Hide the hint.
*/
hideHint: function() {
if (this.hintShown) {
$(this.dHint)
.stop(true, true)
.hide(300, function() {
g.hintShown = false;
g.hintIsHiding = false;
});
this.hintIsHiding = true;
}
},
/**
* Update hint position.
*/
updateHint: function(e) {
if (this.hintShown) {
$(this.dHint).css({
top: e.clientY,
left: e.clientX + 15
});
}
},
/**
* Toggle column's visibility.
* After calling this function and it returns true, afterToggleCol() must be called.
@ -487,7 +448,6 @@
g.cRsz = document.createElement('div'); // column resizer
g.cCpy = document.createElement('div'); // column copy, to store copy of dragged column header
g.cPointer = document.createElement('div'); // column pointer, used when reordering column
g.dHint = document.createElement('div'); // draggable hint
g.cDrop = document.createElement('div'); // column drop-down arrows
g.cList = document.createElement('div'); // column visibility list
@ -499,10 +459,6 @@
g.cPointer.className = 'cPointer';
$(g.cPointer).css('visibility', 'hidden');
// adjust g.dHint
g.dHint.className = 'dHint';
$(g.dHint).hide();
// adjust g.cDrop
g.cDrop.className = 'cDrop';
@ -632,6 +588,14 @@
});
g.reposRsz();
// bind event to update currently hovered qtip API
$(t).find('th').mouseenter(function(e) {
g.qtip = $(this).qtip('api');
});
// create qtip for each <th> with draggable class
PMA_createqTip($(t).find('th.draggable'));
// register events
if (g.reorderHint) { // make sure columns is reorderable
$(t).find('th.draggable')
@ -647,46 +611,47 @@
} else {
$(this).css('cursor', 'inherit');
}
g.showHint(e);
g.updateHint(e);
})
.mouseleave(function(e) {
g.showReorderHint = false;
g.showHint(e);
g.updateHint(e);
});
}
if ($firstRowCols.length > 1) {
$(t).find('th:not(.draggable)')
.mouseenter(function(e) {
var $colVisibTh = $(t).find('th:not(.draggable)');
PMA_createqTip($colVisibTh);
$colVisibTh.mouseenter(function(e) {
g.showColVisibHint = true;
g.showHint(e);
g.updateHint(e);
})
.mouseleave(function(e) {
g.showColVisibHint = false;
g.showHint(e);
g.updateHint(e);
});
}
$(t).find('th.draggable a')
.attr('title', '') // hide default tooltip for sorting
.mouseenter(function(e) {
g.showSortHint = true;
g.showHint(e);
g.updateHint(e);
})
.mouseleave(function(e) {
g.showSortHint = false;
g.showHint(e);
g.updateHint(e);
});
$(t).find('th.marker')
.mouseenter(function(e) {
g.showMarkHint = true;
g.showHint(e);
g.updateHint(e);
})
.mouseleave(function(e) {
g.showMarkHint = false;
g.showHint(e);
g.updateHint(e);
});
$(document).mousemove(function(e) {
g.dragMove(e);
g.updateHint(e);
});
$(document).mouseup(function(e) {
g.dragEnd(e);
@ -708,7 +673,6 @@
$(g.gDiv).append(g.cPointer);
$(g.gDiv).append(g.cDrop);
$(g.gDiv).append(g.cList);
$(g.gDiv).append(g.dHint);
$(g.gDiv).append(g.cCpy);
// some adjustment

17
js/sql.js
View File

@ -1174,9 +1174,10 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings,
}
/**
* Starting from some th, change the class of all td under it
* Starting from some th, change the class of all td under it.
* If isAddClass is specified, it will be used to determine whether to add or remove the class.
*/
function PMA_changeClassForColumn($this_th, newclass) {
function PMA_changeClassForColumn($this_th, newclass, isAddClass) {
// index 0 is the th containing the big T
var th_index = $this_th.index();
var has_big_t = !$this_th.closest('tr').children(':first').hasClass('column_heading');
@ -1185,12 +1186,10 @@ function PMA_changeClassForColumn($this_th, newclass) {
th_index--;
}
var $tds = $this_th.closest('table').find('tbody tr').find('td.data:eq('+th_index+')');
if ($this_th.data('has_class_'+newclass)) {
$tds.removeClass(newclass);
$this_th.data('has_class_'+newclass, false);
if (isAddClass == undefined) {
$tds.toggleClass(newclass);
} else {
$tds.addClass(newclass);
$this_th.data('has_class_'+newclass, true);
$tds.toggleClass(newclass, isAddClass);
}
}
@ -1207,8 +1206,8 @@ $(document).ready(function() {
/**
* vertical column highlighting in horizontal mode when hovering over the column header
*/
$('.column_heading.pointer').live('hover', function() {
PMA_changeClassForColumn($(this), 'hover');
$('.column_heading.pointer').live('hover', function(e) {
PMA_changeClassForColumn($(this), 'hover', e.type == 'mouseenter');
});
/**