Commit 705d0e35 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'abuse-reports-module' into 'master'

Convert AbuseReports class to a module

See merge request gitlab-org/gitlab-ce!14709
parents 2a9147b7 3616e063
const MAX_MESSAGE_LENGTH = 500; const MAX_MESSAGE_LENGTH = 500;
const MESSAGE_CELL_SELECTOR = '.abuse-reports .message'; const MESSAGE_CELL_SELECTOR = '.abuse-reports .message';
class AbuseReports { export default class AbuseReports {
constructor() { constructor() {
$(MESSAGE_CELL_SELECTOR).each(this.truncateLongMessage); $(MESSAGE_CELL_SELECTOR).each(this.truncateLongMessage);
$(document) $(document)
...@@ -32,6 +32,3 @@ class AbuseReports { ...@@ -32,6 +32,3 @@ class AbuseReports {
} }
} }
} }
window.gl = window.gl || {};
window.gl.AbuseReports = AbuseReports;
...@@ -75,6 +75,7 @@ import initProjectVisibilitySelector from './project_visibility'; ...@@ -75,6 +75,7 @@ import initProjectVisibilitySelector from './project_visibility';
import GpgBadges from './gpg_badges'; import GpgBadges from './gpg_badges';
import UserFeatureHelper from './helpers/user_feature_helper'; import UserFeatureHelper from './helpers/user_feature_helper';
import initChangesDropdown from './init_changes_dropdown'; import initChangesDropdown from './init_changes_dropdown';
import AbuseReports from './abuse_reports';
import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils'; import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils';
import AjaxLoadingSpinner from './ajax_loading_spinner'; import AjaxLoadingSpinner from './ajax_loading_spinner';
...@@ -561,7 +562,7 @@ import AjaxLoadingSpinner from './ajax_loading_spinner'; ...@@ -561,7 +562,7 @@ import AjaxLoadingSpinner from './ajax_loading_spinner';
new Labels(); new Labels();
} }
case 'abuse_reports': case 'abuse_reports':
new gl.AbuseReports(); new AbuseReports();
break; break;
} }
break; break;
......
...@@ -54,7 +54,6 @@ import './u2f/register'; ...@@ -54,7 +54,6 @@ import './u2f/register';
import './u2f/util'; import './u2f/util';
// everything else // everything else
import './abuse_reports';
import './activities'; import './activities';
import './admin'; import './admin';
import './api'; import './api';
......
import '~/lib/utils/text_utility'; import '~/lib/utils/text_utility';
import '~/abuse_reports'; import AbuseReports from '~/abuse_reports';
((global) => { describe('Abuse Reports', () => {
describe('Abuse Reports', () => {
const FIXTURE = 'abuse_reports/abuse_reports_list.html.raw'; const FIXTURE = 'abuse_reports/abuse_reports_list.html.raw';
const MAX_MESSAGE_LENGTH = 500; const MAX_MESSAGE_LENGTH = 500;
...@@ -17,7 +16,7 @@ import '~/abuse_reports'; ...@@ -17,7 +16,7 @@ import '~/abuse_reports';
beforeEach(function () { beforeEach(function () {
loadFixtures(FIXTURE); loadFixtures(FIXTURE);
this.abuseReports = new global.AbuseReports(); this.abuseReports = new AbuseReports();
$messages = $('.abuse-reports .message'); $messages = $('.abuse-reports .message');
}); });
...@@ -39,5 +38,4 @@ import '~/abuse_reports'; ...@@ -39,5 +38,4 @@ import '~/abuse_reports';
$longMessage.click(); $longMessage.click();
assertMaxLength($longMessage); assertMaxLength($longMessage);
}); });
}); });
})(window.gl);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment