From 48203e64a9db11e200ab8f40b2cc0fbfc530d7d0 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Mon, 1 Jun 2020 22:55:59 -0700
Subject: [PATCH] Improve test browser notifications

---
 data/interfaces/default/base.html               |  6 ++++--
 data/interfaces/default/js/ajaxNotifications.js |  4 ----
 data/interfaces/default/notifier_config.html    |  5 +----
 plexpy/notifiers.py                             | 13 +++++++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html
index 6ee7e5ee..35c36c28 100644
--- a/data/interfaces/default/base.html
+++ b/data/interfaces/default/base.html
@@ -296,9 +296,7 @@ ${next.modalIncludes()}
 <script src="${http_root}js/ipaddr.min.js"></script>
 <script src="${http_root}js/script.js${cache_param}"></script>
 <script src="${http_root}js/jquery.tripleclick.min.js"></script>
-% if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS:
 <script src="${http_root}js/ajaxNotifications.js"></script>
-% endif
 <script>
     % if _session['user_group'] == 'admin':
     $('body').on('click', '#updateDismiss', function() {
@@ -423,6 +421,10 @@ ${next.modalIncludes()}
         $(document).on('hidden.bs.modal', '.modal', function () {
             $('.modal:visible').length && $(document.body).addClass('modal-open');
         });
+
+        % if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS:
+        check_notifications();
+        % endif
     });
 
     % if _session['user_group'] != 'admin':
diff --git a/data/interfaces/default/js/ajaxNotifications.js b/data/interfaces/default/js/ajaxNotifications.js
index e73b84d0..1dfa62e3 100644
--- a/data/interfaces/default/js/ajaxNotifications.js
+++ b/data/interfaces/default/js/ajaxNotifications.js
@@ -36,7 +36,3 @@ function check_notifications() {
         check_notifications();
     }, 5000);
 }
-
-$(document).ready(function () {
-    check_notifications();
-});
\ No newline at end of file
diff --git a/data/interfaces/default/notifier_config.html b/data/interfaces/default/notifier_config.html
index 07767c6c..671ff2f3 100644
--- a/data/interfaces/default/notifier_config.html
+++ b/data/interfaces/default/notifier_config.html
@@ -853,10 +853,7 @@
                 PNotify.prototype.options.hide = true;
                 PNotify.prototype.options.delay = $('#browser_auto_hide_delay').val() * 1000;
             }
-            var notification = new PNotify({
-                title: $('#test_subject').val(),
-                text: $('#test_body').val()
-            });
+            displayPNotify($('#test_subject').val(), $('#test_body').val());
             showMsg('<i class="fa fa-check"></i> Notification sent.', false, true, 5000);
         }
     }
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 352ad0bb..cd26d37d 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -1123,17 +1123,22 @@ class BROWSER(Notifier):
         return True
 
     def _return_config_options(self):
-        config_option = [{'label': 'Allow Notifications',
+        config_option = [{'label': 'Note',
+                          'description': 'You may need to refresh the page after saving for changes to take effect.',
+                          'input_type': 'help'
+                          },
+                         {'label': 'Allow Notifications',
                           'value': 'Allow Notifications',
                           'name': 'browser_allow_browser',
-                          'description': 'Click to allow browser notifications. You must click this button for each browser.',
+                          'description': 'Click to allow browser notifications. '
+                                         'You must click this button for each browser.',
                           'input_type': 'button'
                           },
                          {'label': 'Auto Hide Delay',
                           'value': self.config['auto_hide_delay'],
                           'name': 'browser_auto_hide_delay',
-                          'description': 'Set the number of seconds for the notification to remain visible. \
-                                          Set 0 to disable auto hiding. (Note: Some browsers have a maximum time limit.)',
+                          'description': 'Set the number of seconds for the notification to remain visible. '
+                                         'Set 0 to disable auto hiding. (Note: Some browsers have a maximum time limit.)',
                           'input_type': 'number'
                           }
                          ]