zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#issue-fix IMPORT IMAGE menu open issue fixed

master
Agriya Dev5 2021-01-06 13:44:44 +05:30
parent f351c37910
commit 72022f12e3
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/editor/EditorStartup.js
View File

@ -455,7 +455,7 @@ class EditorStartup {
}); });
$id('tool_import').addEventListener('click', (e) => { $id('tool_import').addEventListener('click', (e) => {
this.clickImport(); this.clickImport();
window.dispatchEvent(new CustomEvent('importImage')); window.dispatchEvent(new CustomEvent('importImages'));
}); });
$id('tool_save').addEventListener('click', function (e) { $id('tool_save').addEventListener('click', function (e) {
const $editorDialog = document.getElementById('se-svg-editor-dialog'); const $editorDialog = document.getElementById('se-svg-editor-dialog');
@ -617,14 +617,15 @@ class EditorStartup {
* @param {Event} e * @param {Event} e
* @returns {void} * @returns {void}
*/ */
let editorObj = this;
const importImage = function (e) { const importImage = function (e) {
$.process_cancel(this.uiStrings.notification.loadingImage); document.getElementById('se-prompt-dialog').title = editorObj.uiStrings.notification.loadingImage;
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
$('#main_menu').hide(); $('#main_menu').hide();
const file = (e.type === 'drop') ? e.dataTransfer.files[0] : this.files[0]; const file = (e.type === 'drop') ? e.dataTransfer.files[0] : this.files[0];
if (!file) { if (!file) {
$('#dialog_box').hide(); document.getElementById('se-prompt-dialog').setAttribute('close', true);
return; return;
} }
@ -637,15 +638,15 @@ class EditorStartup {
if (file.type.includes('svg')) { if (file.type.includes('svg')) {
reader = new FileReader(); reader = new FileReader();
reader.onloadend = function (ev) { reader.onloadend = function (ev) {
const newElement = this.svgCanvas.importSvgString(ev.target.result, true); const newElement = editorObj.svgCanvas.importSvgString(ev.target.result, true);
this.svgCanvas.ungroupSelectedElement(); editorObj.svgCanvas.ungroupSelectedElement();
this.svgCanvas.ungroupSelectedElement(); editorObj.svgCanvas.ungroupSelectedElement();
this.svgCanvas.groupSelectedElements(); editorObj.svgCanvas.groupSelectedElements();
this.svgCanvas.alignSelectedElements('m', 'page'); editorObj.svgCanvas.alignSelectedElements('m', 'page');
this.svgCanvas.alignSelectedElements('c', 'page'); editorObj.svgCanvas.alignSelectedElements('c', 'page');
// highlight imported element, otherwise we get strange empty selectbox // highlight imported element, otherwise we get strange empty selectbox
this.svgCanvas.selectOnly([newElement]); editorObj.svgCanvas.selectOnly([newElement]);
$('#dialog_box').hide(); document.getElementById('se-prompt-dialog').setAttribute('close', true);
}; };
reader.readAsText(file); reader.readAsText(file);
} else { } else {
@ -659,23 +660,23 @@ class EditorStartup {
* @returns {void} * @returns {void}
*/ */
const insertNewImage = function (imageWidth, imageHeight) { const insertNewImage = function (imageWidth, imageHeight) {
const newImage = this.svgCanvas.addSVGElementFromJson({ const newImage = editorObj.svgCanvas.addSVGElementFromJson({
element: 'image', element: 'image',
attr: { attr: {
x: 0, x: 0,
y: 0, y: 0,
width: imageWidth, width: imageWidth,
height: imageHeight, height: imageHeight,
id: this.svgCanvas.getNextId(), id: editorObj.svgCanvas.getNextId(),
style: 'pointer-events:inherit' style: 'pointer-events:inherit'
} }
}); });
this.svgCanvas.setHref(newImage, result); editorObj.svgCanvas.setHref(newImage, result);
this.svgCanvas.selectOnly([newImage]); editorObj.svgCanvas.selectOnly([newImage]);
this.svgCanvas.alignSelectedElements('m', 'page'); editorObj.svgCanvas.alignSelectedElements('m', 'page');
this.svgCanvas.alignSelectedElements('c', 'page'); editorObj.svgCanvas.alignSelectedElements('c', 'page');
this.topPanelHandlers.updateContextPanel(); editorObj.topPanelHandlers.updateContextPanel();
$('#dialog_box').hide(); document.getElementById('se-prompt-dialog').setAttribute('close', true);
}; };
// create dummy img so we know the default dimensions // create dummy img so we know the default dimensions
let imgWidth = 100; let imgWidth = 100;
@ -697,6 +698,8 @@ class EditorStartup {
this.workarea[0].addEventListener('dragover', this.onDragOver); this.workarea[0].addEventListener('dragover', this.onDragOver);
this.workarea[0].addEventListener('dragleave', this.onDragLeave); this.workarea[0].addEventListener('dragleave', this.onDragLeave);
this.workarea[0].addEventListener('drop', importImage); this.workarea[0].addEventListener('drop', importImage);
const imgImport = $('<input type="file">').change(importImage);
$(window).on('importImages', () => imgImport.click());
} }
this.updateCanvas(true); this.updateCanvas(true);