From fbb66cf2511cbd87562315aef47eda9dc0fa0fcf Mon Sep 17 00:00:00 2001
From: popcorner <351633+popcorner@user.noreply.gitee.com>
Date: Fri, 4 Sep 2020 18:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=BB=9A=E8=BD=AE=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/admincp/admincp_main.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/upload/source/admincp/admincp_main.php b/upload/source/admincp/admincp_main.php
index 4c52bea9b..4d8008490 100644
--- a/upload/source/admincp/admincp_main.php
+++ b/upload/source/admincp/admincp_main.php
@@ -251,7 +251,7 @@ echo <<<EOT
 			obj.scrollTop = obj.scrollTop + scrollh;
 		} else if(op == 3) {
 			if(!e) e = window.event;
-			if(e.wheelDelta <= 0 || e.detail > 0) {
+			if(e.deltaY > 0 || e.wheelDelta <= 0 || e.detail > 0) {
 				obj.scrollTop = obj.scrollTop + 20;
 			} else {
 				obj.scrollTop = obj.scrollTop - 20;
@@ -423,7 +423,9 @@ echo <<<EOT
 	_attachEvent(document.documentElement, 'keydown', resetEscAndF5);
 	_attachEvent(window, 'resize', setMenuScroll, document);
 	_attachEvent(window, 'resize', resizeHeadermenu, document);
-	if(BROWSER.ie){
+	if('onwheel' in document.createElement('div')) {
+		$('leftmenu').addEventListener('wheel', function(e) { menuScroll(3, e) }, false);
+	} else if(document.onmousewheel !== undefined) {
 		$('leftmenu').onmousewheel = function(e) { menuScroll(3, e) };
 	} else {
 		$('leftmenu').addEventListener("DOMMouseScroll", function(e) { menuScroll(3, e) }, false);
-- 
Gitee