Browse Source

Add settings for mouse wheen scroll inertia and scroll amount.
For example:
sudo snap set scrollinertia='200'
sudo snap set scrollamount='200'

Thanks to danger89 and xet7 !

Related #2949

Lauri Ojansivu 5 years ago
parent
commit
9d13001b90

+ 3 - 1
Dockerfile

@@ -110,7 +110,9 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     CORS="" \
     CORS="" \
     CORS_ALLOW_HEADERS="" \
     CORS_ALLOW_HEADERS="" \
     CORS_EXPOSE_HEADERS="" \
     CORS_EXPOSE_HEADERS="" \
-    DEFAULT_AUTHENTICATION_METHOD=""
+    DEFAULT_AUTHENTICATION_METHOD="" \
+    SCROLLINERTIA="0" \
+    SCROLLAMOUNT="auto"
 
 
 # Copy the app to the image
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app
 COPY ${SRC_PATH} /home/wekan/app

+ 5 - 0
docker-compose.yml

@@ -240,6 +240,11 @@ services:
       # https://github.com/wekan/wekan/pull/2560
       # https://github.com/wekan/wekan/pull/2560
       - RICHER_CARD_COMMENT_EDITOR=false
       - RICHER_CARD_COMMENT_EDITOR=false
       #---------------------------------------------------------------
       #---------------------------------------------------------------
+      # ==== MOUSE SCROLL ====
+      # https://github.com/wekan/wekan/issues/2949
+      - SCROLLINERTIA=0
+      - SCROLLAMOUNT=auto
+      #---------------------------------------------------------------
       # ==== CARD OPENED, SEND WEBHOOK MESSAGE ====
       # ==== CARD OPENED, SEND WEBHOOK MESSAGE ====
       # https://github.com/wekan/wekan/issues/2518
       # https://github.com/wekan/wekan/issues/2518
       - CARD_OPENED_WEBHOOK_ENABLED=false
       - CARD_OPENED_WEBHOOK_ENABLED=false

+ 3 - 3
packages/wekan-scrollbar/jquery.mCustomScrollbar.js

@@ -109,9 +109,9 @@ and dependencies (minified).
 			scrollbarPosition:"inside",
 			scrollbarPosition:"inside",
 			/*
 			/*
 			scrolling inertia
 			scrolling inertia
-			values: integer (milliseconds)
+			values: integer (milliseconds). default: 0
 			*/
 			*/
-			scrollInertia:0,
+			scrollInertia:Meteor.settings.public.SCROLLINERTIA,
 			/*
 			/*
 			auto-adjust scrollbar dragger length
 			auto-adjust scrollbar dragger length
 			values: boolean
 			values: boolean
@@ -161,7 +161,7 @@ and dependencies (minified).
 				scrolling amount in pixels
 				scrolling amount in pixels
 				values: "auto", integer
 				values: "auto", integer
 				*/
 				*/
-				scrollAmount:"auto",
+				scrollAmount:Meteor.settings.public.SCROLLAMOUNT,
 				/*
 				/*
 				mouse-wheel scrolling axis
 				mouse-wheel scrolling axis
 				the default scrolling direction when both vertical and horizontal scrollbars are present
 				the default scrolling direction when both vertical and horizontal scrollbars are present

+ 2 - 0
sandstorm-pkgdef.capnp

@@ -239,6 +239,8 @@ const myCommand :Spk.Manifest.Command = (
     (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
     (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
     (key = "WITH_API", value = "true"),
     (key = "WITH_API", value = "true"),
     (key = "RICHER_CARD_COMMENT_EDITOR", value="false"),
     (key = "RICHER_CARD_COMMENT_EDITOR", value="false"),
+    (key = "SCROLLINERTIA", value="0"),
+    (key = "SCROLLAMOUNT", value="auto"),
     (key = "CARD_OPENED_WEBHOOK_ENABLED", value="false"),
     (key = "CARD_OPENED_WEBHOOK_ENABLED", value="false"),
     (key = "BIGEVENTS_PATTERN", value="NONE"),
     (key = "BIGEVENTS_PATTERN", value="NONE"),
     (key = "MATOMO_ADDRESS", value=""),
     (key = "MATOMO_ADDRESS", value=""),

+ 21 - 0
server/scroll.js

@@ -0,0 +1,21 @@
+Meteor.startup(() => {
+  // Mouse Scroll Intertia, issue #2949. Integer.
+  if (process.env.SCROLLINERTIA !== '0') {
+    Meteor.settings.public.SCROLLINERTIA = parseInt(
+      process.env.SCROLLINERTIA,
+      radix,
+    );
+  } else {
+    Meteor.settings.public.SCROLLINERTIA = 0;
+  }
+
+  // Mouse Scroll Amount, issue #2949. "auto" or Integer.
+  if (process.env.SCROLLAMOUNT !== 'auto') {
+    Meteor.settings.public.SCROLLAMOUNT = parseInt(
+      process.env.SCROLLAMOUNT,
+      radix,
+    );
+  } else {
+    Meteor.settings.public.SCROLLAMOUNT = 'auto';
+  }
+});

File diff suppressed because it is too large
+ 0 - 0
snap-src/bin/config


+ 12 - 0
snap-src/bin/wekan-help

@@ -69,6 +69,18 @@ echo -e "\t$ snap set $SNAP_NAME richer-card-comment-editor='true'"
 echo -e "Disabled:"
 echo -e "Disabled:"
 echo -e "\t$ snap set $SNAP_NAME richer-card-comment-editor='false'"
 echo -e "\t$ snap set $SNAP_NAME richer-card-comment-editor='false'"
 echo -e "\n"
 echo -e "\n"
+echo -e "Mousewheel scroll inertia. Default: 0. https://github.com/wekan/wekan/issues/2949"
+echo -e "Enable:"
+echo -e "\t$ snap set $SNAP_NAME scrollinertia='950'"
+echo -e "Disable, default:"
+echo -e "\t$ snap set $SNAP_NAME scrollinertia='0'"
+echo -e "\n"
+echo -e "Mousewheel scroll amount. Default: 'auto'. Allowed: 'auto' or Integer number. https://github.com/wekan/wekan/issues/2949"
+echo -e "Enable:"
+echo -e "\t$ snap set $SNAP_NAME scrollamount='950'"
+echo -e "Disable, default:"
+echo -e "\t$ snap set $SNAP_NAME scrollamount='auto'"
+echo -e "\n"
 echo -e "Card opened, send webhook message. Default: false https://github.com/wekan/wekan/issues/2518"
 echo -e "Card opened, send webhook message. Default: false https://github.com/wekan/wekan/issues/2518"
 echo -e "Enable:"
 echo -e "Enable:"
 echo -e "\t$ snap set $SNAP_NAME card-opened-webhook-enabled='true'"
 echo -e "\t$ snap set $SNAP_NAME card-opened-webhook-enabled='true'"

+ 5 - 0
start-wekan.bat

@@ -25,6 +25,11 @@ REM # ==== RICH TEXT EDITOR IN CARD COMMENTS ====
 REM # https://github.com/wekan/wekan/pull/2560
 REM # https://github.com/wekan/wekan/pull/2560
 SET RICHER_CARD_COMMENT_EDITOR=false
 SET RICHER_CARD_COMMENT_EDITOR=false
 
 
+REM # ==== MOUSE SCROLL ====
+REM # https://github.com/wekan/wekan/issues/2949
+SET SCROLLINERTIA=0
+SET SCROLLAMOUNT=auto
+
 REM # ==== CARD OPENED, SEND WEBHOOK MESSAGE ====
 REM # ==== CARD OPENED, SEND WEBHOOK MESSAGE ====
 SET CARD_OPENED_WEBHOOK_ENABLED=false
 SET CARD_OPENED_WEBHOOK_ENABLED=false
 
 

+ 5 - 0
start-wekan.sh

@@ -41,6 +41,11 @@
       # https://github.com/wekan/wekan/pull/2560
       # https://github.com/wekan/wekan/pull/2560
       export RICHER_CARD_COMMENT_EDITOR=false
       export RICHER_CARD_COMMENT_EDITOR=false
       #---------------------------------------------------------------
       #---------------------------------------------------------------
+      # ==== MOUSE SCROLL ====
+      # https://github.com/wekan/wekan/issues/2949
+      export SCROLLINERTIA=0
+      export SCROLLAMOUNT=auto
+      #---------------------------------------------------------------
       # ==== CARD OPENED, SEND WEBHOOK MESSAGE ====
       # ==== CARD OPENED, SEND WEBHOOK MESSAGE ====
       export CARD_OPENED_WEBHOOK_ENABLED=false
       export CARD_OPENED_WEBHOOK_ENABLED=false
       #---------------------------------------------------------------
       #---------------------------------------------------------------

+ 5 - 0
torodb-postgresql/docker-compose.yml

@@ -230,6 +230,11 @@ services:
       # https://github.com/wekan/wekan/pull/2560
       # https://github.com/wekan/wekan/pull/2560
       - RICHER_CARD_COMMENT_EDITOR=false
       - RICHER_CARD_COMMENT_EDITOR=false
       #---------------------------------------------------------------
       #---------------------------------------------------------------
+      # ==== MOUSE SCROLL ====
+      # https://github.com/wekan/wekan/issues/2949
+      - SCROLLINERTIA=0
+      - SCROLLAMOUNT=auto
+      #---------------------------------------------------------------
       # ==== CARD OPENED, SEND WEBHOOK MESSAGE ====
       # ==== CARD OPENED, SEND WEBHOOK MESSAGE ====
       # https://github.com/wekan/wekan/issues/2518
       # https://github.com/wekan/wekan/issues/2518
       - CARD_OPENED_WEBHOOK_ENABLED=false
       - CARD_OPENED_WEBHOOK_ENABLED=false

Some files were not shown because too many files changed in this diff