nodebb-plugin-pdf-secure2 1.4.6 → 1.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-pdf-secure2",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "Secure PDF viewer plugin for NodeBB - prevents downloading, enables canvas-only rendering with Premium group support",
   "main": "library.js",
   "repository": {

package/static/viewer-app.js

@@ -2787,18 +2787,23 @@
 
 
     // Mouse wheel / touchpad pinch zoom with Ctrl (clamped 0.5x-5x)
+    // Touchpad pinch fires 60+ small events/sec → must heavily dampen.
+    // Mouse wheel fires fewer large events → needs separate handling.
     let zoomAccumulator = 0;
     let zoomRafId = null;
     container.addEventListener('wheel', (e) => {
         if (!e.ctrlKey) return;
         e.preventDefault();
 
-        // Touchpad pinch sends small deltaY values; mouse wheel sends large ones (100+)
-        // Normalize: clamp large mouse wheel jumps, keep touchpad's fine granularity
         const raw = e.deltaY;
-        const clamped = Math.max(-10, Math.min(10, raw));
-        const sensitivity = 0.008;
-        zoomAccumulator -= clamped * sensitivity;
+        const isMouseWheel = Math.abs(raw) >= 50;
+        if (isMouseWheel) {
+            zoomAccumulator += (raw < 0 ? 0.08 : -0.08);
+        } else {
+            const clamped = Math.max(-5, Math.min(5, raw));
+            zoomAccumulator -= clamped * 0.002;
+        }
+        zoomAccumulator = Math.max(-0.04, Math.min(0.04, zoomAccumulator));
 
         if (!zoomRafId) {
             zoomRafId = requestAnimationFrame(() => {

package/static/viewer.html

@@ -7580,16 +7580,37 @@
 
 
 
-            // Mouse wheel zoom with Ctrl
+            // Mouse wheel / touchpad pinch zoom with Ctrl (clamped 0.5x–5x)
+            // Touchpad pinch fires 60+ small events/sec → must heavily dampen.
+            // Mouse wheel fires fewer large events → needs separate handling.
+            let zoomAccumulator = 0;
+            let zoomRafId = null;
             container.addEventListener('wheel', (e) => {
-                if (e.ctrlKey) {
-                    e.preventDefault();
-                    if (e.deltaY < 0) {
-                        pdfViewer.currentScale += 0.1;
-                    } else {
-                        pdfViewer.currentScale -= 0.1;
-                    }
-                    updateAllWatermarkScales();
+                if (!e.ctrlKey) return;
+                e.preventDefault();
+
+                const raw = e.deltaY;
+                // Detect input type: mouse wheel sends |deltaY| >= 50, touchpad sends < 50
+                const isMouseWheel = Math.abs(raw) >= 50;
+                if (isMouseWheel) {
+                    // Mouse wheel: fixed step per click (ignore magnitude)
+                    zoomAccumulator += (raw < 0 ? 0.08 : -0.08);
+                } else {
+                    // Touchpad: very low sensitivity, clamp individual delta
+                    const clamped = Math.max(-5, Math.min(5, raw));
+                    zoomAccumulator -= clamped * 0.002;
+                }
+                // Cap total accumulator per frame (max ~4% zoom per frame)
+                zoomAccumulator = Math.max(-0.04, Math.min(0.04, zoomAccumulator));
+
+                if (!zoomRafId) {
+                    zoomRafId = requestAnimationFrame(() => {
+                        const newScale = pdfViewer.currentScale * (1 + zoomAccumulator);
+                        pdfViewer.currentScale = Math.max(0.5, Math.min(5, newScale));
+                        zoomAccumulator = 0;
+                        zoomRafId = null;
+                        updateAllWatermarkScales();
+                    });
                 }
             }, { passive: false });