Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

This commit is contained in:
Weblate 2014-12-05 03:04:59 +01:00
commit 23507189d5
2 changed files with 2 additions and 0 deletions

View File

@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog
- bug #4616 Warning in db structure print view page
- bug Undefined index navwork, savedsearcheswork, fields
- bug #4620 Undefined index while adding to the central columns list
- bug #4618 Page scrolls while GIS visualization is zoomed in/out with mousewheel
4.3.0.0 (not yet released)
+ rfe #1502 Smart sorting for int keys

View File

@ -215,6 +215,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
});
$('#placeholder').live('mousewheel', function (event, delta) {
event.preventDefault();
var relCoords = getRelativeCoords(event);
if (delta > 0) {
//zoom in