From 7bdcd1549bfb1cc8df28e835bc7947060dfe64ca Mon Sep 17 00:00:00 2001 From: Paulo Veiga Date: Sat, 5 Mar 2022 20:09:25 +0000 Subject: [PATCH] Merged in features/move_menu (pull request #47) Move Menu to editor * Move Menu --- .../assets/images/shape-circle.svg | 0 .../assets/images/shape-line.svg | 0 .../assets/images/shape-rectangle-round.svg | 0 .../assets/images/shape-rectangle.svg | 0 .../src/classes/bootstrap/BootstrapDialog.js | 156 ++++++++++++++++++ .../bootstrap/BootstrapDialogRequest.js | 0 .../src/classes/menu}/AccountSettingsPanel.js | 0 .../src/classes/menu}/ColorPaletteHtml.js | 0 .../src/classes/menu}/ColorPalettePanel.js | 0 packages/editor/src/classes/menu/Events.ts | 68 ++++++++ .../src/classes/menu}/FontFamilyPanel.js | 0 .../src/classes/menu}/FontSizePanel.js | 0 .../src/classes/menu}/IMenu.ts | 12 +- .../src/classes/menu}/IconPanel.js | 3 +- .../classes/menu}/KeyboardShortcutDialog.js | 21 +-- .../classes/menu}/KeyboardShortcutTooltip.js | 2 +- .../src/classes/menu}/ListToolbarPanel.js | 0 .../src/classes/menu}/Menu.ts | 6 +- .../src/classes/menu}/ModalDialogNotifier.js | 2 - .../src/classes/menu}/ToolbarItem.js | 2 +- .../src/classes/menu}/ToolbarPaneItem.js | 2 +- .../src/classes/menu}/TopicShapePanel.js | 0 packages/editor/src/index.tsx | 16 +- packages/editor/tsconfig.json | 2 +- .../mindplot/assets/images/alert-sign.png | Bin 5000 -> 0 bytes .../src/components/DesignerBuilder.ts | 11 -- packages/mindplot/src/components/NoteIcon.ts | 3 +- .../widget/{FloatingTip.js => FloatingTip.ts} | 6 +- .../src/components/widget/LinkEditor.js | 2 +- .../src/components/widget/NoteEditor.js | 2 +- .../bootstrap/BootstrapDialog.js | 0 packages/mindplot/src/index.ts | 10 +- packages/mindplot/tsconfig.json | 2 +- .../editor-page/EditorOptionsBuider.ts | 2 +- 34 files changed, 284 insertions(+), 46 deletions(-) rename packages/{mindplot => editor}/assets/images/shape-circle.svg (100%) rename packages/{mindplot => editor}/assets/images/shape-line.svg (100%) rename packages/{mindplot => editor}/assets/images/shape-rectangle-round.svg (100%) rename packages/{mindplot => editor}/assets/images/shape-rectangle.svg (100%) create mode 100644 packages/editor/src/classes/bootstrap/BootstrapDialog.js rename packages/{mindplot/src/components/libraries => editor/src/classes}/bootstrap/BootstrapDialogRequest.js (100%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/AccountSettingsPanel.js (100%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/ColorPaletteHtml.js (100%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/ColorPalettePanel.js (100%) create mode 100644 packages/editor/src/classes/menu/Events.ts rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/FontFamilyPanel.js (100%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/FontSizePanel.js (100%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/IMenu.ts (88%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/IconPanel.js (97%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/KeyboardShortcutDialog.js (92%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/KeyboardShortcutTooltip.js (96%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/ListToolbarPanel.js (100%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/Menu.ts (99%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/ModalDialogNotifier.js (94%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/ToolbarItem.js (98%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/ToolbarPaneItem.js (97%) rename packages/{mindplot/src/components/widget => editor/src/classes/menu}/TopicShapePanel.js (100%) delete mode 100644 packages/mindplot/assets/images/alert-sign.png rename packages/mindplot/src/components/widget/{FloatingTip.js => FloatingTip.ts} (97%) rename packages/mindplot/src/components/{libraries => widget}/bootstrap/BootstrapDialog.js (100%) diff --git a/packages/mindplot/assets/images/shape-circle.svg b/packages/editor/assets/images/shape-circle.svg similarity index 100% rename from packages/mindplot/assets/images/shape-circle.svg rename to packages/editor/assets/images/shape-circle.svg diff --git a/packages/mindplot/assets/images/shape-line.svg b/packages/editor/assets/images/shape-line.svg similarity index 100% rename from packages/mindplot/assets/images/shape-line.svg rename to packages/editor/assets/images/shape-line.svg diff --git a/packages/mindplot/assets/images/shape-rectangle-round.svg b/packages/editor/assets/images/shape-rectangle-round.svg similarity index 100% rename from packages/mindplot/assets/images/shape-rectangle-round.svg rename to packages/editor/assets/images/shape-rectangle-round.svg diff --git a/packages/mindplot/assets/images/shape-rectangle.svg b/packages/editor/assets/images/shape-rectangle.svg similarity index 100% rename from packages/mindplot/assets/images/shape-rectangle.svg rename to packages/editor/assets/images/shape-rectangle.svg diff --git a/packages/editor/src/classes/bootstrap/BootstrapDialog.js b/packages/editor/src/classes/bootstrap/BootstrapDialog.js new file mode 100644 index 00000000..33099fd5 --- /dev/null +++ b/packages/editor/src/classes/bootstrap/BootstrapDialog.js @@ -0,0 +1,156 @@ +/* + * Copyright [2021] [wisemapping] + * + * Licensed under WiseMapping Public License, Version 1.0 (the "License"). + * It is basically the Apache License, Version 2.0 (the "License") plus the + * "powered by wisemapping" text requirement on every single page; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the license at + * + * http://www.wisemapping.org/license + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import $ from 'jquery'; +import Options from '@wisemapping/mindplot/src/components/Options'; +import { $msg } from '@wisemapping/mindplot/src/components/Messages'; + +class BootstrapDialog extends Options { + constructor(title, options) { + super(); + this.options = { + cancelButton: false, + closeButton: false, + acceptButton: true, + removeButton: false, + errorMessage: false, + onEventData: {}, + }; + + this.setOptions(options); + this.options.onEventData.dialog = this; + this._native = $('').append( + '', + ); + const content = $(''); + const header = this._buildHeader(title); + + if (header) { + content.append(header); + } + const body = $(''); + if (this.options.errorMessage) { + const error = $('
'); + error.hide(); + body.append(error); + } + content.append(body); + const footer = this._buildFooter(); + if (footer) { + content.append(footer); + } + this._native.find('.modal-dialog').append(content); + this._native.on('hidden.bs.modal', function remove() { + $(this).remove(); + }); + this._native.on('shown.bs.modal', this.onDialogShown); + + this._native.appendTo('#mindplot-tooltips'); + } + + _buildFooter() { + let footer = null; + if (this.options.acceptButton || this.options.removeButton || this.options.cancelButton) { + footer = $('