From 15973d12662cd95462d96da9764eeec337c0fe4b Mon Sep 17 00:00:00 2001 From: MaysWind Date: Fri, 7 Oct 2022 21:48:05 +0800 Subject: [PATCH] only show keyboard shortcuts for current os in ariang settings page --- src/scripts/controllers/settings-ariang.js | 3 ++- src/scripts/services/ariaNgKeyboardService.js | 3 +++ src/views/settings-ariang.html | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/scripts/controllers/settings-ariang.js b/src/scripts/controllers/settings-ariang.js index 6b7bc48..a88997f 100644 --- a/src/scripts/controllers/settings-ariang.js +++ b/src/scripts/controllers/settings-ariang.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').controller('AriaNgSettingsController', ['$rootScope', '$scope', '$routeParams', '$window', '$interval', '$timeout', '$filter', 'clipboard', 'ariaNgBuildConfiguration', 'ariaNgLanguages', 'ariaNgCommonService', 'ariaNgNotificationService', 'ariaNgLocalizationService', 'ariaNgLogService', 'ariaNgFileService', 'ariaNgSettingService', 'ariaNgMonitorService', 'ariaNgTitleService', 'aria2SettingService', function ($rootScope, $scope, $routeParams, $window, $interval, $timeout, $filter, clipboard, ariaNgBuildConfiguration, ariaNgLanguages, ariaNgCommonService, ariaNgNotificationService, ariaNgLocalizationService, ariaNgLogService, ariaNgFileService, ariaNgSettingService, ariaNgMonitorService, ariaNgTitleService, aria2SettingService) { + angular.module('ariaNg').controller('AriaNgSettingsController', ['$rootScope', '$scope', '$routeParams', '$window', '$interval', '$timeout', '$filter', 'clipboard', 'ariaNgBuildConfiguration', 'ariaNgLanguages', 'ariaNgCommonService', 'ariaNgKeyboardService', 'ariaNgNotificationService', 'ariaNgLocalizationService', 'ariaNgLogService', 'ariaNgFileService', 'ariaNgSettingService', 'ariaNgMonitorService', 'ariaNgTitleService', 'aria2SettingService', function ($rootScope, $scope, $routeParams, $window, $interval, $timeout, $filter, clipboard, ariaNgBuildConfiguration, ariaNgLanguages, ariaNgCommonService, ariaNgKeyboardService, ariaNgNotificationService, ariaNgLocalizationService, ariaNgLogService, ariaNgFileService, ariaNgSettingService, ariaNgMonitorService, ariaNgTitleService, aria2SettingService) { var extendType = $routeParams.extendType; var lastRefreshPageNotification = null; @@ -55,6 +55,7 @@ settings: ariaNgSettingService.getAllOptions(), sessionSettings: ariaNgSettingService.getAllSessionOptions(), rpcSettings: ariaNgSettingService.getAllRpcSettings(), + isMacKeyboardLike: ariaNgKeyboardService.isMacKeyboardLike(), isSupportReconnect: aria2SettingService.canReconnect(), isSupportBlob: ariaNgFileService.isSupportBlob(), isSupportDarkMode: ariaNgSettingService.isBrowserSupportDarkMode(), diff --git a/src/scripts/services/ariaNgKeyboardService.js b/src/scripts/services/ariaNgKeyboardService.js index 0174133..df99678 100644 --- a/src/scripts/services/ariaNgKeyboardService.js +++ b/src/scripts/services/ariaNgKeyboardService.js @@ -25,6 +25,9 @@ }; return { + isMacKeyboardLike: function () { + return isMacLike; + }, isCtrlAPressed: function (event) { return (isModifierKeyPressed(event) && (event.code === 'KeyA' || getKeyCode(event) === 65)); // Ctrl+A / Command+A }, diff --git a/src/views/settings-ariang.html b/src/views/settings-ariang.html index 6a49a85..2bd2227 100644 --- a/src/views/settings-ariang.html +++ b/src/views/settings-ariang.html @@ -155,8 +155,8 @@ data-trigger="hover" data-placement="auto right" data-container="body" data-html="true" data-content="{{('Supported Keyboard Shortcuts' | translate) + ':
' + ('Remove Selected Task' | translate) + ': Delete
' + - ('Select All Tasks' | translate) + ': Ctrl+A / Command+A
' + - ('Download Now' | translate) + ': Ctrl+Enter / Command+Return'}}"> + ('Select All Tasks' | translate) + ': ' + (!context.isMacKeyboardLike ? 'Ctrl+A' : 'Command+A') + '
' + + ('Download Now' | translate) + ': ' + (!context.isMacKeyboardLike ? 'Ctrl+Enter' : 'Command+Return')}}">