diff --git a/src/scripts/controllers/settings-ariang.js b/src/scripts/controllers/settings-ariang.js index 9d0739e..47a6f8e 100644 --- a/src/scripts/controllers/settings-ariang.js +++ b/src/scripts/controllers/settings-ariang.js @@ -6,12 +6,16 @@ languages: ariaNgLanguages, availableTime: ariaNgCommonService.getTimeOptions([1000, 2000, 3000, 5000, 10000, 30000, 60000], true), trueFalseOptions: [{name: 'True', value: true}, {name: 'False', value: false}], - settings: ariaNgSettingService.getAllOptions(), - supportBrowserNotification: ariaNgNotificationService.isSupportBrowserNotification() + settings: ariaNgSettingService.getAllOptions() }; $scope.settingService = ariaNgSettingService; + $scope.isSupportNotification = function () { + return ariaNgNotificationService.isSupportBrowserNotification() && + ariaNgSettingService.isUseWebSocket($scope.context.settings.protocol); + }; + $scope.setEnableBrowserNotification = function (value) { ariaNgSettingService.setBrowserNotification(value); diff --git a/src/scripts/services/ariaNgSettingService.js b/src/scripts/services/ariaNgSettingService.js index f05f3a1..3de6132 100644 --- a/src/scripts/services/ariaNgSettingService.js +++ b/src/scripts/services/ariaNgSettingService.js @@ -132,8 +132,11 @@ setProtocol: function (value) { setOption('protocol', value); }, - isUseWebSocket: function () { - var protocol = this.getProtocol(); + isUseWebSocket: function (protocol) { + if (!protocol) { + protocol = this.getProtocol(); + } + return protocol == 'ws' || protocol == 'wss'; }, getSecret: function () { diff --git a/src/views/settings-ariang.html b/src/views/settings-ariang.html index d3b9137..a037ead 100644 --- a/src/views/settings-ariang.html +++ b/src/views/settings-ariang.html @@ -33,17 +33,6 @@ -
-
- Enable Browser Notification -
-
- -
-
Aria2 RPC Host @@ -90,6 +79,17 @@
+
+
+ Enable Browser Notification +
+
+ +
+
Global Stat Refresh Interval