From 924799919c1bfea66befaf6c922f4243b68de528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n=20Blanco?= <ruben@rinconblanco.es>
Date: Wed, 30 Nov 2022 12:41:54 +0100
Subject: [PATCH] Make Alert and Compiler-Picker widgets (#4366)
---
static/formatter-registry.ts | 2 +-
static/main.js | 2 +-
static/panes/compiler.ts | 4 ++--
static/panes/conformance-view.ts | 2 +-
static/panes/editor.ts | 2 +-
static/panes/executor.js | 4 ++--
static/panes/tree.ts | 2 +-
static/{ => widgets}/alert.interfaces.ts | 0
static/{ => widgets}/alert.ts | 2 +-
static/{ => widgets}/compiler-picker.ts | 10 +++++-----
static/widgets/load-save.ts | 2 +-
static/widgets/pane-renaming.ts | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
rename static/{ => widgets}/alert.interfaces.ts (100%)
rename static/{ => widgets}/alert.ts (99%)
rename static/{ => widgets}/compiler-picker.ts (98%)
diff --git a/static/formatter-registry.ts b/static/formatter-registry.ts
index 0842de05c..52b790f65 100644
--- a/static/formatter-registry.ts
+++ b/static/formatter-registry.ts
@@ -24,7 +24,7 @@
import * as monaco from 'monaco-editor';
-import {Alert} from './alert';
+import {Alert} from './widgets/alert';
import {Settings} from './settings';
import {FormattingRequest} from './api/formatting.interfaces';
import {getFormattedCode} from './api/api';
diff --git a/static/main.js b/static/main.js
index 02bc7e3e6..3d8293a6a 100644
--- a/static/main.js
+++ b/static/main.js
@@ -43,7 +43,7 @@ var Hub = require('./hub').Hub;
var Sentry = require('@sentry/browser');
var Settings = require('./settings').Settings;
var local = require('./local');
-var Alert = require('./alert').Alert;
+var Alert = require('./widgets/alert').Alert;
var themer = require('./themes');
var motd = require('./motd');
var jsCookie = require('js-cookie');
diff --git a/static/panes/compiler.ts b/static/panes/compiler.ts
index cfca3cef3..0ef070db9 100644
--- a/static/panes/compiler.ts
+++ b/static/panes/compiler.ts
@@ -31,13 +31,13 @@ import * as Components from '../components';
import LruCache from 'lru-cache';
import {options} from '../options';
import * as monaco from 'monaco-editor';
-import {Alert} from '../alert';
+import {Alert} from '../widgets/alert';
import bigInt from 'big-integer';
import {LibsWidget} from '../widgets/libs-widget';
import * as codeLensHandler from '../codelens-handler';
import * as monacoConfig from '../monaco-config';
import * as TimingWidget from '../widgets/timing-info-widget';
-import {CompilerPicker} from '../compiler-picker';
+import {CompilerPicker} from '../widgets/compiler-picker';
import {CompilerService} from '../compiler-service';
import {SiteSettings} from '../settings';
import * as LibUtils from '../lib-utils';
diff --git a/static/panes/conformance-view.ts b/static/panes/conformance-view.ts
index e5bdaae3b..e3d151bd0 100644
--- a/static/panes/conformance-view.ts
+++ b/static/panes/conformance-view.ts
@@ -28,7 +28,7 @@ import $ from 'jquery';
import {ga} from '../analytics';
import * as Components from '../components';
import {CompilerLibs, LibsWidget} from '../widgets/libs-widget';
-import {CompilerPicker} from '../compiler-picker';
+import {CompilerPicker} from '../widgets/compiler-picker';
import * as utils from '../utils';
import * as LibUtils from '../lib-utils';
import {PaneRenaming} from '../widgets/pane-renaming';
diff --git a/static/panes/editor.ts b/static/panes/editor.ts
index 6fda0fafb..3b96e962d 100644
--- a/static/panes/editor.ts
+++ b/static/panes/editor.ts
@@ -30,7 +30,7 @@ import * as Components from '../components';
import * as monaco from 'monaco-editor';
import {Buffer} from 'buffer';
import {options} from '../options';
-import {Alert} from '../alert';
+import {Alert} from '../widgets/alert';
import {ga} from '../analytics';
import * as monacoVim from 'monaco-vim';
import * as monacoConfig from '../monaco-config';
diff --git a/static/panes/executor.js b/static/panes/executor.js
index 6350e8b15..fc5441a0f 100644
--- a/static/panes/executor.js
+++ b/static/panes/executor.js
@@ -30,11 +30,11 @@ var ga = require('../analytics').ga;
var Toggles = require('../widgets/toggles').Toggles;
var FontScale = require('../widgets/fontscale').FontScale;
var options = require('../options').options;
-var Alert = require('../alert').Alert;
+var Alert = require('../widgets/alert').Alert;
var LibsWidget = require('../widgets/libs-widget').LibsWidget;
var AnsiToHtml = require('../ansi-to-html').Filter;
var TimingWidget = require('../widgets/timing-info-widget');
-var CompilerPicker = require('../compiler-picker').CompilerPicker;
+var CompilerPicker = require('../widgets/compiler-picker').CompilerPicker;
var Settings = require('../settings').Settings;
var utils = require('../utils');
var LibUtils = require('../lib-utils');
diff --git a/static/panes/tree.ts b/static/panes/tree.ts
index 9106e46a2..90b401361 100644
--- a/static/panes/tree.ts
+++ b/static/panes/tree.ts
@@ -30,7 +30,7 @@ import {Settings, SiteSettings} from '../settings';
import {PaneRenaming} from '../widgets/pane-renaming';
import {Hub} from '../hub';
import {EventHub} from '../event-hub';
-import {Alert} from '../alert';
+import {Alert} from '../widgets/alert';
import * as Components from '../components';
import {ga} from '../analytics';
import TomSelect from 'tom-select';
diff --git a/static/alert.interfaces.ts b/static/widgets/alert.interfaces.ts
similarity index 100%
rename from static/alert.interfaces.ts
rename to static/widgets/alert.interfaces.ts
diff --git a/static/alert.ts b/static/widgets/alert.ts
similarity index 99%
rename from static/alert.ts
rename to static/widgets/alert.ts
index 5f432317d..eb582169f 100644
--- a/static/alert.ts
+++ b/static/widgets/alert.ts
@@ -25,7 +25,7 @@
import $ from 'jquery';
import {AlertAskOptions, AlertEnterTextOptions, AlertNotifyOptions} from './alert.interfaces';
-import {toggleEventListener} from './utils';
+import {toggleEventListener} from '../utils';
export class Alert {
yesHandler: ((answer?: string | string[] | number) => void) | null = null;
diff --git a/static/compiler-picker.ts b/static/widgets/compiler-picker.ts
similarity index 98%
rename from static/compiler-picker.ts
rename to static/widgets/compiler-picker.ts
index aed09bf27..33f22fa46 100644
--- a/static/compiler-picker.ts
+++ b/static/widgets/compiler-picker.ts
@@ -25,11 +25,11 @@
import $ from 'jquery';
import TomSelect from 'tom-select';
-import {ga} from './analytics';
-import * as local from './local';
-import {EventHub} from './event-hub';
-import {Hub} from './hub';
-import {CompilerService} from './compiler-service';
+import {ga} from '../analytics';
+import * as local from '../local';
+import {EventHub} from '../event-hub';
+import {Hub} from '../hub';
+import {CompilerService} from '../compiler-service';
type Favourites = {
[compilerId: string]: boolean;
diff --git a/static/widgets/load-save.ts b/static/widgets/load-save.ts
index 7b27e0119..eeea642a8 100644
--- a/static/widgets/load-save.ts
+++ b/static/widgets/load-save.ts
@@ -25,7 +25,7 @@
import $ from 'jquery';
import _ from 'underscore';
import {saveAs} from 'file-saver';
-import {Alert} from '../alert';
+import {Alert} from './alert';
import {ga} from '../analytics';
import * as local from '../local';
import {Language} from '../../types/languages.interfaces';
diff --git a/static/widgets/pane-renaming.ts b/static/widgets/pane-renaming.ts
index 6c1c07d51..509a2370b 100644
--- a/static/widgets/pane-renaming.ts
+++ b/static/widgets/pane-renaming.ts
@@ -25,7 +25,7 @@
import $ from 'jquery';
import {Tab} from 'golden-layout';
import {EventEmitter} from 'events';
-import {Alert} from '../alert';
+import {Alert} from './alert';
export class PaneRenaming extends EventEmitter.EventEmitter {
private pane: any;
--
GitLab