diff --git a/src/modules/cte/CopiedTemplateEditor.ts b/src/modules/cte/CopiedTemplateEditor.ts index 95284a87..a7c8c0f7 100644 --- a/src/modules/cte/CopiedTemplateEditor.ts +++ b/src/modules/cte/CopiedTemplateEditor.ts @@ -1,7 +1,7 @@ import CopiedTemplateEditorDialog from './ui/CopiedTemplateEditorDialog'; import type { Deputy } from '../../Deputy'; import unwrapWidget from '../../util/unwrapWidget'; -import CopiedTemplate from './models/CopiedTemplate'; +import CopiedTemplate from './models/templates/CopiedTemplate'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import cteStyles from './css/copied-template-editor.css'; diff --git a/src/modules/cte/models/RowChangeEvent.ts b/src/modules/cte/events/RowChangeEvent.ts similarity index 84% rename from src/modules/cte/models/RowChangeEvent.ts rename to src/modules/cte/events/RowChangeEvent.ts index 9e9a291d..fac525db 100644 --- a/src/modules/cte/models/RowChangeEvent.ts +++ b/src/modules/cte/events/RowChangeEvent.ts @@ -1,4 +1,4 @@ -import CopiedTemplateRow from './CopiedTemplateRow'; +import CopiedTemplateRow from '../models/templates/CopiedTemplateRow'; /** * An event that reflects a change in a given {{copied}} template diff --git a/src/modules/cte/events/TemplateInsertEvent.ts b/src/modules/cte/events/TemplateInsertEvent.ts new file mode 100644 index 00000000..b4915da7 --- /dev/null +++ b/src/modules/cte/events/TemplateInsertEvent.ts @@ -0,0 +1,19 @@ +import AttributionNotice from '../models/AttributionNotice'; + +/** + * An event dispatched when a template inside a `CopiedTemplateEditorDialog` is inserted. + */ +export default class TemplateInsertEvent extends Event { + + template: AttributionNotice; + + /** + * @param template The template that was inserted + * @param eventInitDict + */ + constructor( template: AttributionNotice, eventInitDict?: EventInit ) { + super( 'templateInsert', eventInitDict ); + this.template = template; + } + +} diff --git a/src/modules/cte/models/CTEParsoidDocument.ts b/src/modules/cte/models/CTEParsoidDocument.ts index 9d00d6d4..1f4da891 100644 --- a/src/modules/cte/models/CTEParsoidDocument.ts +++ b/src/modules/cte/models/CTEParsoidDocument.ts @@ -2,25 +2,8 @@ import ParsoidDocument from '@chlodalejandro/parsoid'; import last from '../../../util/last'; import AttributionNotice from './AttributionNotice'; import WikiAttributionNotices from './WikiAttributionNotices'; -import CopiedTemplate from './CopiedTemplate'; - -/** - * An event dispatched when a template inside a `CopiedTemplateEditorDialog` is inserted. - */ -export class TemplateInsertEvent extends Event { - - template: AttributionNotice; - - /** - * @param template The template that was inserted - * @param eventInitDict - */ - constructor( template: AttributionNotice, eventInitDict?: EventInit ) { - super( 'templateInsert', eventInitDict ); - this.template = template; - } - -} +import CopiedTemplate from './templates/CopiedTemplate'; +import TemplateInsertEvent from '../events/TemplateInsertEvent'; /** * Extension class of ParsoidDocument's node. Used to type `parsoidDocument` in the diff --git a/src/modules/cte/models/TemplateMerger.ts b/src/modules/cte/models/TemplateMerger.ts index b0df0250..11ec042e 100644 --- a/src/modules/cte/models/TemplateMerger.ts +++ b/src/modules/cte/models/TemplateMerger.ts @@ -1,4 +1,4 @@ -import type CopiedTemplate from './CopiedTemplate'; +import type CopiedTemplate from './templates/CopiedTemplate'; /** * Merges templates together. Its own class to avoid circular dependencies. diff --git a/src/modules/cte/models/WikiAttributionNotices.ts b/src/modules/cte/models/WikiAttributionNotices.ts index f6679c94..cd948c96 100644 --- a/src/modules/cte/models/WikiAttributionNotices.ts +++ b/src/modules/cte/models/WikiAttributionNotices.ts @@ -1,7 +1,7 @@ import nsId from '../../../util/nsId'; import getObjectValues from '../../../util/getObjectValues'; import toRedirectsObject from '../../../util/toRedirectsObject'; -import CopiedTemplate from './CopiedTemplate'; +import CopiedTemplate from './templates/CopiedTemplate'; /** * An object mapping notice types to their expected on-wiki page titles. diff --git a/src/modules/cte/models/CopiedTemplate.ts b/src/modules/cte/models/templates/CopiedTemplate.ts similarity index 95% rename from src/modules/cte/models/CopiedTemplate.ts rename to src/modules/cte/models/templates/CopiedTemplate.ts index d12ed239..4ee74bf2 100644 --- a/src/modules/cte/models/CopiedTemplate.ts +++ b/src/modules/cte/models/templates/CopiedTemplate.ts @@ -2,11 +2,11 @@ import CopiedTemplateRow, { copiedTemplateRowParameters, ExistingRawCopiedTemplateRow, RawCopiedTemplateRow } from './CopiedTemplateRow'; -import RowChangeEvent from './RowChangeEvent'; -import AttributionNotice from './AttributionNotice'; -import { AttributionNoticePageLayout } from '../ui/pages/AttributionNoticePageLayout'; -import CopiedTemplatePage from '../ui/pages/CopiedTemplatePage'; -import { AttributionNoticePageGenerator } from '../ui/pages/AttributionNoticePageGenerator'; +import RowChangeEvent from '../../events/RowChangeEvent'; +import AttributionNotice from '../AttributionNotice'; +import { AttributionNoticePageLayout } from '../../ui/pages/AttributionNoticePageLayout'; +import CopiedTemplatePage from '../../ui/pages/CopiedTemplatePage'; +import { AttributionNoticePageGenerator } from '../../ui/pages/AttributionNoticePageGenerator'; /** * Represents a single {{copied}} template in the Parsoid document. diff --git a/src/modules/cte/models/CopiedTemplateRow.ts b/src/modules/cte/models/templates/CopiedTemplateRow.ts similarity index 96% rename from src/modules/cte/models/CopiedTemplateRow.ts rename to src/modules/cte/models/templates/CopiedTemplateRow.ts index 73674c64..ec5f1bfe 100644 --- a/src/modules/cte/models/CopiedTemplateRow.ts +++ b/src/modules/cte/models/templates/CopiedTemplateRow.ts @@ -2,8 +2,8 @@ * Copied template rows as strings. */ import CopiedTemplate from './CopiedTemplate'; -import CopiedTemplateRowPage from '../ui/pages/CopiedTemplateRowPage'; -import { AttributionNoticePageGenerator } from '../ui/pages/AttributionNoticePageGenerator'; +import CopiedTemplateRowPage from '../../ui/pages/CopiedTemplateRowPage'; +import { AttributionNoticePageGenerator } from '../../ui/pages/AttributionNoticePageGenerator'; export const copiedTemplateRowParameters = [ 'from', 'from_oldid', 'to', 'to_diff', diff --git a/src/modules/cte/ui/CopiedTemplateEditorDialog.tsx b/src/modules/cte/ui/CopiedTemplateEditorDialog.tsx index 83e65b5d..466ef3e4 100644 --- a/src/modules/cte/ui/CopiedTemplateEditorDialog.tsx +++ b/src/modules/cte/ui/CopiedTemplateEditorDialog.tsx @@ -1,6 +1,6 @@ import '../../../types'; import CopiedTemplatesEmptyPage from './pages/AttributionNoticesEmptyPage'; -import CTEParsoidDocument, { TemplateInsertEvent } from '../models/CTEParsoidDocument'; +import CTEParsoidDocument from '../models/CTEParsoidDocument'; import errorToOO from '../../../util/errorToOO'; import { blockExit, unblockExit } from '../../../util/blockExit'; import unwrapWidget from '../../../util/unwrapWidget'; @@ -12,6 +12,7 @@ import { h } from 'tsx-dom'; import AttributionNotice from '../models/AttributionNotice'; import { AttributionNoticePageLayout } from './pages/AttributionNoticePageLayout'; import TemplateMerger from '../models/TemplateMerger'; +import TemplateInsertEvent from '../events/TemplateInsertEvent'; interface CopiedTemplateEditorDialogData { main: CopiedTemplateEditor; diff --git a/src/modules/cte/ui/pages/CopiedTemplatePage.tsx b/src/modules/cte/ui/pages/CopiedTemplatePage.tsx index bf46dd51..423dbb81 100644 --- a/src/modules/cte/ui/pages/CopiedTemplatePage.tsx +++ b/src/modules/cte/ui/pages/CopiedTemplatePage.tsx @@ -1,11 +1,11 @@ import { h } from 'tsx-dom'; import '../../../../types'; -import type CopiedTemplate from '../../models/CopiedTemplate'; +import type CopiedTemplate from '../../models/templates/CopiedTemplate'; import CopiedTemplateRowPage from './CopiedTemplateRowPage'; import unwrapWidget from '../../../../util/unwrapWidget'; -import CopiedTemplateRow from '../../models/CopiedTemplateRow'; +import CopiedTemplateRow from '../../models/templates/CopiedTemplateRow'; import CTEParsoidDocument from '../../models/CTEParsoidDocument'; -import RowChangeEvent from '../../models/RowChangeEvent'; +import RowChangeEvent from '../../events/RowChangeEvent'; import CopiedTemplateEditorDialog from '../CopiedTemplateEditorDialog'; import { OOUIBookletLayout } from '../../../../types'; import removeElement from '../../../../util/removeElement'; diff --git a/src/modules/cte/ui/pages/CopiedTemplateRowPage.tsx b/src/modules/cte/ui/pages/CopiedTemplateRowPage.tsx index 1baf9975..e5c662b0 100644 --- a/src/modules/cte/ui/pages/CopiedTemplateRowPage.tsx +++ b/src/modules/cte/ui/pages/CopiedTemplateRowPage.tsx @@ -1,8 +1,10 @@ /* eslint-disable camelcase */ import { h } from 'tsx-dom'; import '../../../../types'; -import CopiedTemplateRow, { CopiedTemplateRowParameter } from '../../models/CopiedTemplateRow'; -import RowChangeEvent from '../../models/RowChangeEvent'; +import CopiedTemplateRow, { + CopiedTemplateRowParameter +} from '../../models/templates/CopiedTemplateRow'; +import RowChangeEvent from '../../events/RowChangeEvent'; import unwrapWidget from '../../../../util/unwrapWidget'; import copyToClipboard from '../../../../util/copyToClipboard'; import getObjectValues from '../../../../util/getObjectValues';