From 7cd76f55715a566b994181c82c44f4d8d774d805 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Wed, 29 Jun 2016 23:30:01 +0800
Subject: [PATCH] hide browser notification setting when protocol is http or
 https

---
 src/scripts/controllers/settings-ariang.js   |  8 +++++--
 src/scripts/services/ariaNgSettingService.js |  7 +++++--
 src/views/settings-ariang.html               | 22 ++++++++++----------
 3 files changed, 22 insertions(+), 15 deletions(-)

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 @@
                 </select>
             </div>
         </div>
-        <div class="row" ng-if="context.supportBrowserNotification">
-            <div class="setting-key setting-key-without-desc col-sm-4">
-                <span translate>Enable Browser Notification</span>
-            </div>
-            <div class="setting-value col-sm-8">
-                <select class="form-control" style="width: 100%;" ng-model="context.settings.browserNotification"
-                        ng-change="setEnableBrowserNotification(context.settings.browserNotification)"
-                        ng-options="option.value as (option.name | translate) for option in context.trueFalseOptions">
-                </select>
-            </div>
-        </div>
         <div class="row">
             <div class="setting-key setting-key-without-desc col-sm-4">
                 <span translate>Aria2 RPC Host</span>
@@ -90,6 +79,17 @@
                 <input class="form-control" type="password" ng-model="context.settings.secret" ng-change="settingService.setSecret(context.settings.secret)"/>
             </div>
         </div>
+        <div class="row" ng-if="isSupportNotification()">
+            <div class="setting-key setting-key-without-desc col-sm-4">
+                <span translate>Enable Browser Notification</span>
+            </div>
+            <div class="setting-value col-sm-8">
+                <select class="form-control" style="width: 100%;" ng-model="context.settings.browserNotification"
+                        ng-change="setEnableBrowserNotification(context.settings.browserNotification)"
+                        ng-options="option.value as (option.name | translate) for option in context.trueFalseOptions">
+                </select>
+            </div>
+        </div>
         <div class="row">
             <div class="setting-key setting-key-without-desc col-sm-4">
                 <span translate>Global Stat Refresh Interval</span>