Code improvementsdispatcher-switch

3 files changed, 8 insertions, 7 deletions

diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index a26df93e6a1..1ccf96a75dc 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -19,7 +19,7 @@ function initFieldErrors() {
   });
 }
 
-function initPageShortcuts() {
+function initPageShortcuts(page) {
   const pagesWithCustomShortcuts = [
     'projects:activity',
     'projects:artifacts:browse',
@@ -44,7 +44,7 @@ function initPageShortcuts() {
     'groups:show',
   ];
 
-  if (pagesWithCustomShortcuts.indexOf(page) == -1) {
+  if (pagesWithCustomShortcuts.indexOf(page) === -1) {
     new Shortcuts();
   }
 }
@@ -76,8 +76,9 @@ export default () => {
   initSearch();
   initFieldErrors();
 
-  if ($('body').attr('data-page')) {
-    initPageShortcuts();
+  const page = $('body').attr('data-page');
+  if (page) {
+    initPageShortcuts(page);
     initGFMInput();
     initPerformanceBar();
   }
diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
index d1312ee83f8..f92450cbaa7 100644
--- a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
+++ b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
@@ -3,7 +3,7 @@ import axios from '~/lib/utils/axios_utils';
 import flash from '~/flash';
 import { __ } from '~/locale';
 
-document.addEventListener('DOMContentLoaded', () => {
+export default () => {
   $('input#broadcast_message_color').on('input', function onMessageColorInput() {
     const previewColor = $(this).val();
     $('div.broadcast-message-preview').css('background-color', previewColor);
@@ -32,4 +32,4 @@ document.addEventListener('DOMContentLoaded', () => {
       .catch(() => flash(__('An error occurred while rendering preview broadcast message')));
     }
   }, 250));
-});
+};
diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/index.js b/app/assets/javascripts/pages/admin/broadcast_messages/index.js
index b548c48282a..d6cc6a850eb 100644
--- a/app/assets/javascripts/pages/admin/broadcast_messages/index.js
+++ b/app/assets/javascripts/pages/admin/broadcast_messages/index.js
@@ -1,3 +1,3 @@
 import initBroadcastMessagesForm from './broadcast_message';
 
-export default () => initBroadcastMessagesForm();
+document.addEventListener('DOMContentLoaded', initBroadcastMessagesForm);