diff --git a/src/static/js/broadcast_slider.ts b/src/static/js/broadcast_slider.ts index b630496eb..8ff1b9d20 100644 --- a/src/static/js/broadcast_slider.ts +++ b/src/static/js/broadcast_slider.ts @@ -24,9 +24,9 @@ // These parameters were global, now they are injected. A reference to the // Timeslider controller would probably be more appropriate. -const _ = require('./underscore'); -const padmodals = require('./pad_modals').padmodals; -const colorutils = require('./colorutils').colorutils; +import _ from './underscore.js'; +import {padmodals} from './pad_modals.js'; +import {colorutils} from './colorutils.js'; import html10n from './vendors/html10n'; const loadBroadcastSliderJS = (fireWhenAllScriptsAreLoaded) => { @@ -373,4 +373,4 @@ const loadBroadcastSliderJS = (fireWhenAllScriptsAreLoaded) => { return BroadcastSlider; }; -exports.loadBroadcastSliderJS = loadBroadcastSliderJS; +export {loadBroadcastSliderJS}; diff --git a/src/static/js/chat.ts b/src/static/js/chat.ts index 35b0e96b0..fd0aa5e37 100644 --- a/src/static/js/chat.ts +++ b/src/static/js/chat.ts @@ -16,20 +16,19 @@ * limitations under the License. */ -import ChatMessage from './ChatMessage'; -import padutils from './pad_utils' -const padcookie = require('./pad_cookie').padcookie; -const Tinycon = require('tinycon/tinycon'); -const hooks = require('./pluginfw/hooks'); -const padeditor = require('./pad_editor').padeditor; +import ChatMessage from './ChatMessage.js'; +import padutils from './pad_utils.js' +import {padcookie} from './pad_cookie.js'; +import Tinycon from 'tinycon/tinycon'; +import hooks from './pluginfw/hooks.js'; +import {padeditor} from './pad_editor.js'; import html10n from './vendors/html10n'; // Removes diacritics and lower-cases letters. https://stackoverflow.com/a/37511463 const normalize = (s) => s.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(); -exports.chat = (() => { - let isStuck = false; +const chat = (() => { let userAndChat = false; let chatMentions = 0; return { @@ -296,3 +295,5 @@ exports.chat = (() => { }, }; })(); + +export {chat}; diff --git a/src/static/js/collab_client.ts b/src/static/js/collab_client.ts index c90f92e80..f49377a9b 100644 --- a/src/static/js/collab_client.ts +++ b/src/static/js/collab_client.ts @@ -23,9 +23,9 @@ * limitations under the License. */ -const chat = require('./chat').chat; -const hooks = require('./pluginfw/hooks'); -const browser = require('./vendors/browser'); +import {chat} from './chat.js'; +import hooks from './pluginfw/hooks.js'; +import browser from './vendors/browser.js'; // Dependency fill on init. This exists for `pad.socket` only. // TODO: bind directly to the socket. @@ -510,4 +510,4 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad) return self; }; -exports.getCollabClient = getCollabClient; +export {getCollabClient};