Skip to content

Commit

Permalink
Merge branch 'main' into 298-restore-edit-scl-name-in-compas-versions
Browse files Browse the repository at this point in the history
Signed-off-by: Juan Munoz <juancho0202@gmail.com>
  • Loading branch information
juancho0202 committed Dec 10, 2023
2 parents e240255 + 3e1b4a3 commit 7623eba
Show file tree
Hide file tree
Showing 29 changed files with 205 additions and 2,480 deletions.
457 changes: 0 additions & 457 deletions packages/compas-open-scd/src/Editing.ts

This file was deleted.

4 changes: 2 additions & 2 deletions packages/compas-open-scd/src/Plugging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Switch } from '@material/mwc-switch';
import { TextField } from '@material/mwc-textfield';

import { ifImplemented, Mixin } from 'open-scd/src/foundation.js';
import { EditingElement } from './Editing.js';
import { EditingElement } from 'open-scd/src/Editing.js';
import { officialPlugins } from '../public/js/plugins.js';
import { Nsdoc } from 'open-scd/src/foundation/nsdoc.js';
import { HistoringElement } from './Historing.js';
Expand Down Expand Up @@ -99,7 +99,7 @@ function staticTagHtml(

type PluginKind = 'editor' | 'menu' | 'validator';
const menuPosition = ['top', 'middle', 'bottom'] as const;
type MenuPosition = typeof menuPosition[number];
type MenuPosition = (typeof menuPosition)[number];

export type Plugin = {
name: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/compas-open-scd/src/Setting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
import { Language, languages, loader } from './translations/loader.js';

import 'open-scd/src/WizardDivider.js';
import { WizardDialog } from './wizard-dialog.js';
import { WizardDialog } from 'open-scd/src/wizard-dialog.js';

import {
iec6185072,
Expand Down
2 changes: 1 addition & 1 deletion packages/compas-open-scd/src/compas/Compasing.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { html, query, state, property, TemplateResult } from 'lit-element';

import { Mixin } from 'open-scd/src/foundation.js';
import { EditingElement } from '../Editing.js';
import { EditingElement } from 'open-scd/src/Editing.js';

import { CompasUserInfoService } from '../compas-services/CompasUserInfoService.js';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { get } from 'lit-translate';
import { newWizardEvent, Wizard } from 'open-scd/src/foundation.js';

import { DocRetrievedEvent } from '../compas/CompasOpen.js';
import { mergeSubstation } from './UpdateSubstation.js';
import { mergeSubstation } from 'open-scd/src/menu/UpdateSubstation.js';

import '../compas/CompasOpen.js';

Expand Down
150 changes: 0 additions & 150 deletions packages/compas-open-scd/src/menu/UpdateSubstation.ts

This file was deleted.

7 changes: 5 additions & 2 deletions packages/compas-open-scd/src/open-scd.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ import {

import { ListItem } from '@material/mwc-list/mwc-list-item';

import { newOpenDocEvent, newPendingStateEvent } from 'open-scd/src/foundation.js';
import {
newOpenDocEvent,
newPendingStateEvent,
} from 'open-scd/src/foundation.js';
import { getTheme } from 'open-scd/src/themes.js';

import { Editing } from './Editing.js';
import { Editing } from 'open-scd/src/Editing.js';
import { Hosting } from './Hosting.js';
import { Historing } from './Historing.js';
import { Plugging } from './Plugging.js';
Expand Down
Loading

0 comments on commit 7623eba

Please sign in to comment.