only show keyboard shortcuts for current os in ariang settings page

This commit is contained in:
MaysWind
2022-10-07 21:48:05 +08:00
parent a6fcc3945b
commit 15973d1266
3 changed files with 7 additions and 3 deletions

View File

@@ -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(),

View File

@@ -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
},

View File

@@ -155,8 +155,8 @@
data-trigger="hover" data-placement="auto right" data-container="body" data-html="true"
data-content="{{('Supported Keyboard Shortcuts' | translate) + ':<br/>' +
('Remove Selected Task' | translate) + ': <span class=\'keyboard-key\'>Delete</span><br/>' +
('Select All Tasks' | translate) + ': <span class=\'keyboard-key\'>Ctrl</span>+<span class=\'keyboard-key\'>A</span> / <span class=\'keyboard-key\'>Command</span>+<span class=\'keyboard-key\'>A</span><br/>' +
('Download Now' | translate) + ': <span class=\'keyboard-key\'>Ctrl</span>+<span class=\'keyboard-key\'>Enter</span> / <span class=\'keyboard-key\'>Command</span>+<span class=\'keyboard-key\'>Return</span>'}}"></i>
('Select All Tasks' | translate) + ': ' + (!context.isMacKeyboardLike ? '<span class=\'keyboard-key\'>Ctrl</span>+<span class=\'keyboard-key\'>A</span>' : '<span class=\'keyboard-key\'>Command</span>+<span class=\'keyboard-key\'>A</span>') + '<br/>' +
('Download Now' | translate) + ': ' + (!context.isMacKeyboardLike ? '<span class=\'keyboard-key\'>Ctrl</span>+<span class=\'keyboard-key\'>Enter</span>' : '<span class=\'keyboard-key\'>Command</span>+<span class=\'keyboard-key\'>Return</span>')}}"></i>
</div>
<div class="setting-value col-sm-8">
<select class="form-control" style="width: 100%;" ng-model="context.settings.keyboardShortcuts"