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 2012-09-09 13:27:20 +02:00
commit e53ad4fde7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/codemirror/lib/codemirror.js vendored
View File

@ -625,7 +625,8 @@ var CodeMirror = (function() {
setSelection(selFrom, selTo, updateLine(sel.from.line), updateLine(sel.to.line));
// Make sure the scroll-size div has the correct height.
code.style.height = (doc.height * textHeight() + 2 * paddingTop()) + "px";
if (scroller.clientHeight)
code.style.height = (doc.height * textHeight() + 2 * paddingTop()) + "px";
}
function replaceRange(code, from, to) {

4
js/server_status.js
View File

@ -391,7 +391,7 @@ $(function() {
yaxis: {
autoscale:true,
label: PMA_messages['strTotalCount'],
labelRenderer: $.jqplot.CanvasAxisLabelRenderer,
labelRenderer: $.jqplot.CanvasAxisLabelRenderer
}
},
seriesDefaults: {
@ -403,7 +403,7 @@ $(function() {
show: true,
location: 's', // compass direction, nw, n, ne, e, se, s, sw, w.
xoffset: 12, // pixel offset of the legend box from the x (or x2) axis.
yoffset: 12, // pixel offset of the legend box from the y (or y2) axis.
yoffset: 12 // pixel offset of the legend box from the y (or y2) axis.
}
};