Merge pull request #24 from hartman/jquery3

dschwen · web-flow · commit eaa3bbd68921 · 2017-08-29T09:50:57.000-06:00
Make jQuery 3 compatible
diff --git a/index.html b/index.html
@@ -41,7 +41,7 @@
         e.source.postMessage('1,1','*');
       }
     }
-    $(window).bind('message',wmaMessageHub);
+    $(window).on('message',wmaMessageHub);
   </script>
 </head>
 <body>
diff --git a/index_dev.html b/index_dev.html
@@ -18,7 +18,7 @@
       e.source.postMessage('1,1','*');
     }
   }
-  $(window).bind('message',wmaMessageHub);
+  $(window).on('message',wmaMessageHub);
 </script>
 </head>
 <body>
diff --git a/wikiminiatlas.js b/wikiminiatlas.js
@@ -488,7 +488,7 @@ jQuery(function ($) {
    }
   }
 
-  mapbutton.bind( 'click', { param:
+  mapbutton.on( 'click', { param:
    marker.lat + '_' + marker.lon + '_' +
    wc.width + '_' + wc.height + '_' +
    site + '_' + zoomlevel + '_' + language + '&globe=' + globe }, showIFrame );
@@ -507,7 +507,7 @@ jQuery(function ($) {
    .css('padding', rtl ? '0px 3px 0px 0px' : '0px 0px 0px 3px' ).css('cursor', 'pointer')
    .attr('src', wc.buttonImage).attr('srcset', wc.buttonImage + ' 1x, ' + wc.buttonImage2x + ' 2x')
    .addClass('wmamapbutton noprint')
-   .bind( 'click', { param:
+   .on( 'click', { param:
     alat + '_' + alon + '_' +
     wc.width + '_' + wc.height + '_' +
     site + '_' + zoomlevel + '_' + language
@@ -691,13 +691,13 @@ jQuery(function ($) {
         adjusthelper();
 
         $('body')
-         .bind('mouseup.wmaresize', function(e) {
-          $('body').unbind('mousemove.wmaresize');
-          $('body').unbind('mouseup.wmaresize');
+         .on('mouseup.wmaresize', function(e) {
+          $('body').off('mousemove.wmaresize');
+          $('body').off('mouseup.wmaresize');
           idle = true;
           wi.resizehelper.hide();
          } )
-         .bind('mousemove.wmaresize', function(e) {
+         .on('mousemove.wmaresize', function(e) {
           wc.width -= dir*(e.pageX-lastx);
           wc.height += (e.pageY-lasty);
           lastx = e.pageX; lasty = e.pageY;
@@ -713,7 +713,7 @@ jQuery(function ($) {
    );
   })();
 
-  $(window).bind('message', messageHub);
+  $(window).on('message', messageHub);
 
   // Fire event for other code to extend or integrate with WMA
   if (initPromises.length) {
diff --git a/wmacore.js b/wmacore.js
@@ -708,7 +708,7 @@ function wikiminiatlasInstall(wma_widget, url_params)
     $(document).on('keydown', wmaKeypress);
     $(document).on('contextmenu', function() { return false; });
 
-    $('body').bind('dragstart', function() { return false; })
+    $('body').on('dragstart', function() { return false; })
     $('#wma_map').click(function(e) {
         // only count clicks if the mouse pointer has not moved between mouse down and mouse up!
         var r = wmaMouseCoords(e); //TODO: VERIFY this!!!!
@@ -797,7 +797,7 @@ function wikiminiatlasInstall(wma_widget, url_params)
     // initialize message passing
     if (window.postMessage)
     {
-      $(window).bind('message', wmaReceiveMessage);
+      $(window).on('message', wmaReceiveMessage);
       if (window != window.top)
       {
         try {
diff --git a/wmacore_dev.js b/wmacore_dev.js
@@ -708,7 +708,7 @@ function wikiminiatlasInstall(wma_widget, url_params)
     $(document).on('keydown', wmaKeypress);
     $(document).on('contextmenu', function() { return false; });
 
-    $('body').bind('dragstart', function() { return false; })
+    $('body').on('dragstart', function() { return false; })
     $('#wma_map').click(function(e) {
         // only count clicks if the mouse pointer has not moved between mouse down and mouse up!
         var r = wmaMouseCoords(e); //TODO: VERIFY this!!!!
@@ -797,7 +797,7 @@ function wikiminiatlasInstall(wma_widget, url_params)
     // initialize message passing
     if (window.postMessage)
     {
-      $(window).bind('message', wmaReceiveMessage);
+      $(window).on('message', wmaReceiveMessage);
       if (window != window.top)
       {
         try {

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`e.source.postMessage('1,1','*');`
`42`	`42`	`}`
`43`	`43`	`}`
`44`		`- $(window).bind('message',wmaMessageHub);`
	`44`	`+ $(window).on('message',wmaMessageHub);`
`45`	`45`	`</script>`
`46`	`46`	`</head>`
`47`	`47`	`<body>`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`e.source.postMessage('1,1','*');`
`19`	`19`	`}`
`20`	`20`	`}`
`21`		`- $(window).bind('message',wmaMessageHub);`
	`21`	`+ $(window).on('message',wmaMessageHub);`
`22`	`22`	`</script>`
`23`	`23`	`</head>`
`24`	`24`	`<body>`