diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-09 12:40:52 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-09 12:40:52 +0300 |
commit | 705d0e35da6058d95eb8f262fb2523c48d6b2fc6 (patch) | |
tree | 9293cc4da6548305f27be9fb273f4e45cd1aacbc /app/assets | |
parent | 2a9147b747ded82e0970c3f8235e9d9e27bd0ab4 (diff) | |
parent | 3616e063e3dafc6eb4e627aa211e1030788b0be2 (diff) |
Merge branch 'abuse-reports-module' into 'master'
Convert AbuseReports class to a module
See merge request gitlab-org/gitlab-ce!14709
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/abuse_reports.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/main.js | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/javascripts/abuse_reports.js b/app/assets/javascripts/abuse_reports.js index 346de4ad11e..3de192d56eb 100644 --- a/app/assets/javascripts/abuse_reports.js +++ b/app/assets/javascripts/abuse_reports.js @@ -1,7 +1,7 @@ const MAX_MESSAGE_LENGTH = 500; const MESSAGE_CELL_SELECTOR = '.abuse-reports .message'; -class AbuseReports { +export default class AbuseReports { constructor() { $(MESSAGE_CELL_SELECTOR).each(this.truncateLongMessage); $(document) @@ -32,6 +32,3 @@ class AbuseReports { } } } - -window.gl = window.gl || {}; -window.gl.AbuseReports = AbuseReports; diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 6a4dce20f24..c3349c382ad 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -75,6 +75,7 @@ import initProjectVisibilitySelector from './project_visibility'; import GpgBadges from './gpg_badges'; import UserFeatureHelper from './helpers/user_feature_helper'; import initChangesDropdown from './init_changes_dropdown'; +import AbuseReports from './abuse_reports'; import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils'; import AjaxLoadingSpinner from './ajax_loading_spinner'; @@ -561,7 +562,7 @@ import AjaxLoadingSpinner from './ajax_loading_spinner'; new Labels(); } case 'abuse_reports': - new gl.AbuseReports(); + new AbuseReports(); break; } break; diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 64d7c80e689..853546b617b 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -54,7 +54,6 @@ import './u2f/register'; import './u2f/util'; // everything else -import './abuse_reports'; import './activities'; import './admin'; import './api'; |