From f890939609181d2a496d0700e98e0d994121d337 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 30 Jun 2017 16:39:33 -0500 Subject: [PATCH] refactor Wikis class to ES module syntax --- app/assets/javascripts/dispatcher.js | 3 ++- app/assets/javascripts/main.js | 1 - app/assets/javascripts/wikis.js | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index a7a72baabce..217c7f6cd62 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -53,6 +53,7 @@ import UsersSelect from './users_select'; import RefSelectDropdown from './ref_select_dropdown'; import GfmAutoComplete from './gfm_auto_complete'; import ShortcutsBlob from './shortcuts_blob'; +import Wikis from './wikis'; import ZenMode from './zen_mode'; import initSettingsPanels from './settings_panels'; import initExperimentalFlags from './experimental_flags'; @@ -483,7 +484,7 @@ import OAuthRememberMe from './oauth_remember_me'; new NotificationsDropdown(); break; case 'wikis': - new gl.Wikis(); + new Wikis(); shortcut_handler = new ShortcutsWiki(); new ZenMode(); new gl.GLForm($('.wiki-form'), true); diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 3524a6c5133..9dff74b3c99 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -161,7 +161,6 @@ import './username_validator'; import './users_select'; import './version_check_image'; import './visibility_select'; -import './wikis'; // eslint-disable-next-line global-require, import/no-commonjs if (process.env.NODE_ENV !== 'production') require('./test_utils/'); diff --git a/app/assets/javascripts/wikis.js b/app/assets/javascripts/wikis.js index 03d183ebd84..00676bcb0b3 100644 --- a/app/assets/javascripts/wikis.js +++ b/app/assets/javascripts/wikis.js @@ -1,10 +1,9 @@ -/* eslint-disable no-param-reassign */ /* global Breakpoints */ import 'vendor/jquery.nicescroll'; import './breakpoints'; -class Wikis { +export default class Wikis { constructor() { this.bp = Breakpoints.get(); this.sidebarEl = document.querySelector('.js-wiki-sidebar'); @@ -63,6 +62,3 @@ class Wikis { } } } - -window.gl = window.gl || {}; -window.gl.Wikis = Wikis;