From f3eaed07b2d6855997fb9937c765e05d82a0884f Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 12 Jan 2022 19:27:54 -0800 Subject: [PATCH] Remove modal dialog --- .../src/components/widget/LoadingModal.js | 45 ------------------- packages/mindplot/src/indexLoader.ts | 8 ---- .../test/playground/map-render/js/editor.js | 5 --- .../test/playground/map-render/js/viewmode.js | 1 - 4 files changed, 59 deletions(-) delete mode 100644 packages/mindplot/src/components/widget/LoadingModal.js diff --git a/packages/mindplot/src/components/widget/LoadingModal.js b/packages/mindplot/src/components/widget/LoadingModal.js deleted file mode 100644 index 5e4ff2a6..00000000 --- a/packages/mindplot/src/components/widget/LoadingModal.js +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright [2022] [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'; - -class LoadingModal { - constructor() { - this.element = $( - ``, - ); - this.element.modal('hide'); - this.element.appendTo(document.body); - } - - show() { - this.element.modal('show'); - } - - hide() { - this.element.modal('hide'); - } -} - -export default LoadingModal; diff --git a/packages/mindplot/src/indexLoader.ts b/packages/mindplot/src/indexLoader.ts index 082a14d5..3e4556a9 100644 --- a/packages/mindplot/src/indexLoader.ts +++ b/packages/mindplot/src/indexLoader.ts @@ -22,7 +22,6 @@ import jquery from 'jquery'; import { $notify, } from './components/widget/ToolbarNotifier'; -import LoadingModal from './components/widget/LoadingModal'; import { buildDesigner, } from './components/DesignerBuilder'; @@ -37,9 +36,6 @@ import DesignerOptionsBuilder from './components/DesignerOptionsBuilder'; global.jQuery = jquery; require('@libraries/bootstrap/js/bootstrap'); -const loadingModal = new LoadingModal(); -loadingModal.show(); - // Configure designer options ... let persistence:PersistenceManager; if (!global.memoryPersistence && !global.readOnly) { @@ -71,10 +67,6 @@ const options = DesignerOptionsBuilder.buildOptions( // Build designer ... const designer = buildDesigner(options); -designer.addEvent('loadSuccess', () => { - loadingModal.hide(); -}); - // Load map from XML file persisted on disk... const instance = PersistenceManager.getInstance(); const mindmap = instance.load(global.mapId); diff --git a/packages/mindplot/test/playground/map-render/js/editor.js b/packages/mindplot/test/playground/map-render/js/editor.js index 6e563d63..7b3a8e75 100644 --- a/packages/mindplot/test/playground/map-render/js/editor.js +++ b/packages/mindplot/test/playground/map-render/js/editor.js @@ -1,16 +1,12 @@ import '../css/editor.css'; import { buildDesigner } from '../../../../src/components/DesignerBuilder'; import { PersistenceManager, LocalStorageManager } from '../../../../src'; -import LoadingModal from '../../../../src/components/widget/LoadingModal'; import DesignerOptionsBuilder from '../../../../src/components/DesignerOptionsBuilder'; // Account details ... global.accountName = 'Test User'; global.accountEmail = 'test@example.com'; -const loadingModal = new LoadingModal(); -loadingModal.show(); - const p = new LocalStorageManager('samples/{id}.wxml'); const options = DesignerOptionsBuilder.buildOptions({ persistenceManager: p @@ -18,7 +14,6 @@ const options = DesignerOptionsBuilder.buildOptions({ const designer = buildDesigner(options); designer.addEvent('loadSuccess', () => { - loadingModal.hide(); // Hack for automation testing ... document.getElementById('mindplot').classList.add('ready'); }); diff --git a/packages/mindplot/test/playground/map-render/js/viewmode.js b/packages/mindplot/test/playground/map-render/js/viewmode.js index 802bf6a0..b5b0fe0e 100644 --- a/packages/mindplot/test/playground/map-render/js/viewmode.js +++ b/packages/mindplot/test/playground/map-render/js/viewmode.js @@ -3,7 +3,6 @@ import { buildDesigner } from '../../../../src/components/DesignerBuilder'; import { PersistenceManager, LocalStorageManager } from '../../../../src'; import DesignerOptionsBuilder from '../../../../src/components/DesignerOptionsBuilder'; - const p = new LocalStorageManager('samples/{id}.wxml'); const options = DesignerOptionsBuilder.buildOptions({ persistenceManager: p, readOnly: true, saveOnLoad: false });