Skip to content

Commit

Permalink
file moves and reorganization
Browse files Browse the repository at this point in the history
  • Loading branch information
ChlodAlejandro committed Jul 27, 2022
1 parent 8e086e1 commit 9810a94
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/modules/cte/CopiedTemplateEditor.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 19 additions & 0 deletions src/modules/cte/events/TemplateInsertEvent.ts
Original file line number Diff line number Diff line change
@@ -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;
}

}
21 changes: 2 additions & 19 deletions src/modules/cte/models/CTEParsoidDocument.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/modules/cte/models/TemplateMerger.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/modules/cte/models/WikiAttributionNotices.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = <const>[
'from', 'from_oldid', 'to', 'to_diff',
Expand Down
3 changes: 2 additions & 1 deletion src/modules/cte/ui/CopiedTemplateEditorDialog.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/modules/cte/ui/pages/CopiedTemplatePage.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 4 additions & 2 deletions src/modules/cte/ui/pages/CopiedTemplateRowPage.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down

0 comments on commit 9810a94

Please sign in to comment.