yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2326 from umbraco/v15/fix/move-code-editor-modal

Browse Source
This commit is contained in:
Niels Lyngsø
2024-09-23 13:06:39 +02:00
committed by GitHub
parent 137b4bf45d 7fda65d933
commit 2dc3ab7e09
10 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts → src/Umbraco.Web.UI.Client/src/packages/code-editor/code-editor-modal/code-editor-modal.element.ts
View File

@@ -1,9 +1,7 @@
import type { UmbCodeEditorElement } from '../components/code-editor.element.js';
import type { UmbCodeEditorModalData, UmbCodeEditorModalValue } from './code-editor-modal.token.js';
import { css, html, ifDefined, customElement, query } from '@umbraco-cms/backoffice/external/lit';
import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor';
import type { UmbCodeEditorModalData, UmbCodeEditorModalValue } from '@umbraco-cms/backoffice/modal';
import '@umbraco-cms/backoffice/code-editor';
const elementName = 'umb-code-editor-modal';

2
src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.stories.ts → src/Umbraco.Web.UI.Client/src/packages/code-editor/code-editor-modal/code-editor-modal.stories.ts
View File

@@ -1,8 +1,8 @@
import '../confirm/confirm-modal.element.js';
import type { UmbCodeEditorModalData } from './code-editor-modal.token.js';
import type { Meta, Story } from '@storybook/web-components';
import { html } from '@umbraco-cms/backoffice/external/lit';
import type { UmbCodeEditorModalData } from '@umbraco-cms/backoffice/modal';
export default {
title: 'API/Modals/Layouts/Code Editor',

2
src/Umbraco.Web.UI.Client/src/packages/core/modal/token/code-editor-modal.token.ts → src/Umbraco.Web.UI.Client/src/packages/code-editor/code-editor-modal/code-editor-modal.token.ts
View File

@@ -1,4 +1,4 @@
import { UmbModalToken } from './modal-token.js';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
// TODO => investigate why exporting CodeEditorLanguage in code-editor barrel
// causes the schema generation task to fail... For now, language property below

1
src/Umbraco.Web.UI.Client/src/packages/code-editor/code-editor-modal/index.ts Normal file
View File

@@ -0,0 +1 @@
export * from './code-editor-modal.token.js';

8
src/Umbraco.Web.UI.Client/src/packages/code-editor/code-editor-modal/manifests.ts Normal file
View File

@@ -0,0 +1,8 @@
export const manifests: Array<UmbExtensionManifest> = [
{
type: 'modal',
alias: 'Umb.Modal.CodeEditor',
name: 'Code Editor Modal',
element: () => import('./code-editor-modal.element.js'),
},
];

2
src/Umbraco.Web.UI.Client/src/packages/code-editor/index.ts
View File

@@ -1,5 +1,7 @@
export * from './components/index.js';
export * from './models/index.js';
export * from './code-editor-modal/index.js';
export type { UmbCodeEditorController } from './code-editor.controller.js';
/**

3
src/Umbraco.Web.UI.Client/src/packages/code-editor/manifests.ts
View File

@@ -1,3 +1,4 @@
import { manifest as propertyEditorManifest } from './property-editor/manifests.js';
import { manifests as codeEditorModalManifests } from './code-editor-modal/manifests.js';
export const manifests: Array<UmbExtensionManifest> = [propertyEditorManifest];
export const manifests: Array<UmbExtensionManifest> = [propertyEditorManifest, ...codeEditorModalManifests];

6
src/Umbraco.Web.UI.Client/src/packages/core/modal/common/manifests.ts
View File

@@ -5,12 +5,6 @@ export const manifests: Array<UmbExtensionManifest> = [
name: 'Confirm Modal',
element: () => import('./confirm/confirm-modal.element.js'),
},
{
type: 'modal',
alias: 'Umb.Modal.CodeEditor',
name: 'Code Editor Modal',
element: () => import('./code-editor/code-editor-modal.element.js'),
},
{
type: 'modal',
alias: 'Umb.Modal.EmbeddedMedia',

1
src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
View File

@@ -1,5 +1,4 @@
export * from './change-password-modal.token.js';
export * from './code-editor-modal.token.js';
export * from './confirm-modal.token.js';
export * from './debug-modal.token.js';
export * from './embedded-media-modal.token.js';

3
src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-code-editor.plugin.ts
View File

@@ -1,6 +1,7 @@
import { type TinyMcePluginArguments, UmbTinyMcePluginBase } from '../components/input-tiny-mce/tiny-mce-plugin.js';
import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
import { UMB_CODE_EDITOR_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
import { UMB_CODE_EDITOR_MODAL } from '@umbraco-cms/backoffice/code-editor';
import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
export default class UmbTinyMceCodeEditorPlugin extends UmbTinyMcePluginBase {
constructor(args: TinyMcePluginArguments) {