Browse Source

fixbug : zoomwheel firefox compatibility

julpec 8 years ago
parent
commit
6a2fba840f
1 changed files with 5 additions and 2 deletions
  1. 5 2
      panorama/static/panorama/js/pano.js

+ 5 - 2
panorama/static/panorama/js/pano.js

@@ -694,10 +694,12 @@ function wheel_zoom (event) {
 	zshift.y = event.pageY-canvas.height/2-canvas_pos.y;
 	zshift.y = event.pageY-canvas.height/2-canvas_pos.y;
     }
     }
     //event.preventDefault();
     //event.preventDefault();
-    if (event.wheelDelta < 0 && zoom_control.value < zoom_control.max) {
+
+    var delta = (event.wheelDelta || -event.detail);
+    if (delta < 0 && zoom_control.value < zoom_control.max) {
 	zoom_control.value++;
 	zoom_control.value++;
 	change_zoom(zshift.x, zshift.y);
 	change_zoom(zshift.x, zshift.y);
-    } else if (event.wheelDelta > 0 && zoom_control.value > zoom_control.min) {
+    } else if (delta > 0 && zoom_control.value > zoom_control.min) {
 	zoom_control.value--;
 	zoom_control.value--;
 	change_zoom(zshift.x, zshift.y);
 	change_zoom(zshift.x, zshift.y);
     }
     }
@@ -1080,6 +1082,7 @@ function load_pano() {
     canvas.addEventListener('touchstart', onImageClick, false);
     canvas.addEventListener('touchstart', onImageClick, false);
     document.addEventListener('keydown', keys, false);
     document.addEventListener('keydown', keys, false);
     canvas.addEventListener('mousewheel', wheel_zoom, false);
     canvas.addEventListener('mousewheel', wheel_zoom, false);
+    canvas.addEventListener('DOMMouseScroll', wheel_zoom, false);
     window.onresize = canvas_resize;
     window.onresize = canvas_resize;
     if (adding) {
     if (adding) {
 	document.getElementById("paramFormHide").onclick = hideForm;
 	document.getElementById("paramFormHide").onclick = hideForm;