diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-03-05 21:51:03 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-03-05 21:51:03 +0200 |
commit | 9d13001b903f9ec50f5fa3a4bdbacae32b27ac65 (patch) | |
tree | 7fb9a10a67205276e2b46b6ca369ba22b26b79a3 | |
parent | 965c3fb07fb16de9d525d7c094d299fd5d3960bc (diff) | |
download | wekan-9d13001b903f9ec50f5fa3a4bdbacae32b27ac65.tar.gz wekan-9d13001b903f9ec50f5fa3a4bdbacae32b27ac65.tar.bz2 wekan-9d13001b903f9ec50f5fa3a4bdbacae32b27ac65.zip |
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
-rw-r--r-- | Dockerfile | 4 | ||||
-rw-r--r-- | docker-compose.yml | 5 | ||||
-rw-r--r-- | packages/wekan-scrollbar/jquery.mCustomScrollbar.js | 6 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 2 | ||||
-rw-r--r-- | server/scroll.js | 21 | ||||
-rwxr-xr-x | snap-src/bin/config | 10 | ||||
-rwxr-xr-x | snap-src/bin/wekan-help | 12 | ||||
-rwxr-xr-x | start-wekan.bat | 5 | ||||
-rwxr-xr-x | start-wekan.sh | 5 | ||||
-rw-r--r-- | torodb-postgresql/docker-compose.yml | 5 |
10 files changed, 70 insertions, 5 deletions
@@ -110,7 +110,9 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build- CORS="" \ CORS_ALLOW_HEADERS="" \ CORS_EXPOSE_HEADERS="" \ - DEFAULT_AUTHENTICATION_METHOD="" + DEFAULT_AUTHENTICATION_METHOD="" \ + SCROLLINERTIA="0" \ + SCROLLAMOUNT="auto" # Copy the app to the image COPY ${SRC_PATH} /home/wekan/app diff --git a/docker-compose.yml b/docker-compose.yml index dea7873f..ea5ffe99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -240,6 +240,11 @@ services: # https://github.com/wekan/wekan/pull/2560 - RICHER_CARD_COMMENT_EDITOR=false #--------------------------------------------------------------- + # ==== MOUSE SCROLL ==== + # https://github.com/wekan/wekan/issues/2949 + - SCROLLINERTIA=0 + - SCROLLAMOUNT=auto + #--------------------------------------------------------------- # ==== CARD OPENED, SEND WEBHOOK MESSAGE ==== # https://github.com/wekan/wekan/issues/2518 - CARD_OPENED_WEBHOOK_ENABLED=false diff --git a/packages/wekan-scrollbar/jquery.mCustomScrollbar.js b/packages/wekan-scrollbar/jquery.mCustomScrollbar.js index 056e4284..e7d49997 100644 --- a/packages/wekan-scrollbar/jquery.mCustomScrollbar.js +++ b/packages/wekan-scrollbar/jquery.mCustomScrollbar.js @@ -109,9 +109,9 @@ and dependencies (minified). scrollbarPosition:"inside", /* scrolling inertia - values: integer (milliseconds) + values: integer (milliseconds). default: 0 */ - scrollInertia:0, + scrollInertia:Meteor.settings.public.SCROLLINERTIA, /* auto-adjust scrollbar dragger length values: boolean @@ -161,7 +161,7 @@ and dependencies (minified). scrolling amount in pixels values: "auto", integer */ - scrollAmount:"auto", + scrollAmount:Meteor.settings.public.SCROLLAMOUNT, /* mouse-wheel scrolling axis the default scrolling direction when both vertical and horizontal scrollbars are present diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index e712cb55..4aa22044 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -239,6 +239,8 @@ const myCommand :Spk.Manifest.Command = ( (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"), (key = "WITH_API", value = "true"), (key = "RICHER_CARD_COMMENT_EDITOR", value="false"), + (key = "SCROLLINERTIA", value="0"), + (key = "SCROLLAMOUNT", value="auto"), (key = "CARD_OPENED_WEBHOOK_ENABLED", value="false"), (key = "BIGEVENTS_PATTERN", value="NONE"), (key = "MATOMO_ADDRESS", value=""), diff --git a/server/scroll.js b/server/scroll.js new file mode 100644 index 00000000..4035a623 --- /dev/null +++ b/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'; + } +}); diff --git a/snap-src/bin/config b/snap-src/bin/config index a4c23a42..e7305bb2 100755 --- a/snap-src/bin/config +++ b/snap-src/bin/config @@ -3,7 +3,7 @@ # All supported keys are defined here together with descriptions and default values # list of supported keys -keys="DEBUG MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD ATTACHMENTS_STORE_PATH" +keys="DEBUG MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD ATTACHMENTS_STORE_PATH SCROLLINERTIA SCROLLAMOUNT" # default values DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'" @@ -449,3 +449,11 @@ KEY_LOGOUT_ON_MINUTES="logout-on-minutes" DESCRIPTION_DEFAULT_AUTHENTICATION_METHOD="The default authentication method used if a user does not exist to create and authenticate. Method can be password or ldap." DEFAULT_DEFAULT_AUTHENTICATION_METHOD="" KEY_DEFAULT_AUTHENTICATION_METHOD="default-authentication-method" + +DESCRIPTION_SCROLLINERTIA="Mousewheel scroll inertia, issue #2949. Default: 0" +DEFAULT_SCROLLINERTIA="0" +KEY_SCROLLINERTIA="scrollinertia" + +DESCRIPTION_SCROLLINERTIA="Mousewheel scroll amount, issue #2949. Default: 'auto'" +DEFAULT_SCROLLINERTIA="auto" +KEY_SCROLLINERTIA="scrollamount" diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help index 5d222b5d..b925afeb 100755 --- a/snap-src/bin/wekan-help +++ b/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 "\t$ snap set $SNAP_NAME richer-card-comment-editor='false'" 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 "Enable:" echo -e "\t$ snap set $SNAP_NAME card-opened-webhook-enabled='true'" diff --git a/start-wekan.bat b/start-wekan.bat index 718025ed..bb5b883c 100755 --- a/start-wekan.bat +++ b/start-wekan.bat @@ -25,6 +25,11 @@ REM # ==== RICH TEXT EDITOR IN CARD COMMENTS ==== REM # https://github.com/wekan/wekan/pull/2560 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 ==== SET CARD_OPENED_WEBHOOK_ENABLED=false diff --git a/start-wekan.sh b/start-wekan.sh index 8dade1cc..9a839b3c 100755 --- a/start-wekan.sh +++ b/start-wekan.sh @@ -41,6 +41,11 @@ # https://github.com/wekan/wekan/pull/2560 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 ==== export CARD_OPENED_WEBHOOK_ENABLED=false #--------------------------------------------------------------- diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml index 01a39fc0..7dbc2049 100644 --- a/torodb-postgresql/docker-compose.yml +++ b/torodb-postgresql/docker-compose.yml @@ -230,6 +230,11 @@ services: # https://github.com/wekan/wekan/pull/2560 - RICHER_CARD_COMMENT_EDITOR=false #--------------------------------------------------------------- + # ==== MOUSE SCROLL ==== + # https://github.com/wekan/wekan/issues/2949 + - SCROLLINERTIA=0 + - SCROLLAMOUNT=auto + #--------------------------------------------------------------- # ==== CARD OPENED, SEND WEBHOOK MESSAGE ==== # https://github.com/wekan/wekan/issues/2518 - CARD_OPENED_WEBHOOK_ENABLED=false |