Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

1 files changed, 26 insertions, 26 deletions

diff --git a/js/tbl_gis_visualization.js b/js/tbl_gis_visualization.js
index 6ff9743a93..71787428fd 100644
--- a/js/tbl_gis_visualization.js
+++ b/js/tbl_gis_visualization.js
@@ -181,19 +181,19 @@ function getRelativeCoords(e) {
  * Unbind all event handlers before tearing down a page
  */
 AJAX.registerTeardown('tbl_gis_visualization.js', function () {
-    $('#choice').die('click');
-    $('#placeholder').die('mousewheel');
-    $('svg').die('dragstart');
-    $('svg').die('mouseup');
-    $('svg').die('drag');
-    $('#placeholder').die('dblclick');
-    $('#zoom_in').die('click');
-    $('#zoom_world').die('click');
-    $('#zoom_out').die('click');
-    $('#left_arrow').die('click');
-    $('#right_arrow').die('click');
-    $('#up_arrow').die('click');
-    $('#down_arrow').die('click');
+    $(document).off('click', '#choice');
+    $(document).off('mousewheel', '#placeholder');
+    $(document).off('dragstart', 'svg');
+    $(document).off('mouseup', 'svg');
+    $(document).off('drag', 'svg');
+    $(document).off('dblclick', '#placeholder');
+    $(document).off('click', '#zoom_in');
+    $(document).off('click', '#zoom_world');
+    $(document).off('click', '#zoom_out');
+    $(document).off('click', '#left_arrow');
+    $(document).off('click', '#right_arrow');
+    $(document).off('click', '#up_arrow');
+    $(document).off('click', '#down_arrow');
     $('.vector').unbind('mousemove').unbind('mouseout');
 });
 
@@ -204,7 +204,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
         initGISVisualization();
     }
 
-    $('#choice').live('click', function () {
+    $(document).on('click', '#choice', function () {
         if ($(this).prop('checked') === false) {
             $('#placeholder').show();
             $('#openlayersmap').hide();
@@ -214,7 +214,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
         }
     });
 
-    $('#placeholder').live('mousewheel', function (event, delta) {
+    $(document).on('mousewheel', '#placeholder', function (event, delta) {
         event.preventDefault();
         var relCoords = getRelativeCoords(event);
         if (delta > 0) {
@@ -238,17 +238,17 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
     var dragX = 0;
     var dragY = 0;
 
-    $('svg').live('dragstart', function (event, dd) {
+    $(document).on('dragstart', 'svg', function (event, dd) {
         $('#placeholder').addClass('placeholderDrag');
         dragX = Math.round(dd.offsetX);
         dragY = Math.round(dd.offsetY);
     });
 
-    $('svg').live('mouseup', function (event) {
+    $(document).on('mouseup', 'svg', function (event) {
         $('#placeholder').removeClass('placeholderDrag');
     });
 
-    $('svg').live('drag', function (event, dd) {
+    $(document).on('drag', 'svg', function (event, dd) {
         newX = Math.round(dd.offsetX);
         x +=  newX - dragX;
         dragX = newX;
@@ -258,7 +258,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
         zoomAndPan();
     });
 
-    $('#placeholder').live('dblclick', function (event) {
+    $(document).on('dblclick', '#placeholder', function (event) {
         scale *= zoomFactor;
         // zooming in keeping the position under mouse pointer unmoved.
         var relCoords = getRelativeCoords(event);
@@ -267,7 +267,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
         zoomAndPan();
     });
 
-    $('#zoom_in').live('click', function (e) {
+    $(document).on('click', '#zoom_in', function (e) {
         e.preventDefault();
         //zoom in
         scale *= zoomFactor;
@@ -280,7 +280,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
         zoomAndPan();
     });
 
-    $('#zoom_world').live('click', function (e) {
+    $(document).on('click', '#zoom_world', function (e) {
         e.preventDefault();
         scale = 1;
         x = defaultX;
@@ -288,7 +288,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
         zoomAndPan();
     });
 
-    $('#zoom_out').live('click', function (e) {
+    $(document).on('click', '#zoom_out', function (e) {
         e.preventDefault();
         //zoom out
         scale /= zoomFactor;
@@ -301,25 +301,25 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
         zoomAndPan();
     });
 
-    $('#left_arrow').live('click', function (e) {
+    $(document).on('click', '#left_arrow', function (e) {
         e.preventDefault();
         x += 100;
         zoomAndPan();
     });
 
-    $('#right_arrow').live('click', function (e) {
+    $(document).on('click', '#right_arrow', function (e) {
         e.preventDefault();
         x -= 100;
         zoomAndPan();
     });
 
-    $('#up_arrow').live('click', function (e) {
+    $(document).on('click', '#up_arrow', function (e) {
         e.preventDefault();
         y += 100;
         zoomAndPan();
     });
 
-    $('#down_arrow').live('click', function (e) {
+    $(document).on('click', '#down_arrow', function (e) {
         e.preventDefault();
         y -= 100;
         zoomAndPan();