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

Merge pull request #419 from SVG-Edit/fix-issue-359 

fix issue with undo because this.elem was overwritten with node.remove()
master
JFH 2020-06-30 23:59:58 +02:00 committed by GitHub
parent 18d73cfefa 61591f6a2e
commit e641cb1a0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cypress/integration/ui/issues/issue-359.js Normal file
View File

@ -0,0 +1,26 @@
import {
visitAndApproveStorage
} from '../../../support/ui-test-helper.js';
// See https://github.com/SVG-Edit/svgedit/issues/359
describe('Fix issue 359', function () {
beforeEach(() => {
visitAndApproveStorage();
});
it('can undo without throwing', function () {
cy.get('#tool_source').click();
cy.get('#svg_source_textarea')
.type('{selectall}')
.type(`<svg width="640" height="480" xmlns="http://www.w3.org/2000/svg">
<g class="layer">
<title>Layer 1</title>
<rect fill="#ffff00" height="70" width="165" x="179.5" y="146.5"/>
</g>
</svg>`, {parseSpecialCharSequences: false});
cy.get('#tool_source_save').click();
cy.get('#tool_undo').click();
cy.get('#tool_redo').click(); // test also redo to make the test more comprehensive
// if the undo throws an error to the console, the test will fail
});
});

7
editor/extensions/ext-connector.js
View File

@ -573,18 +573,19 @@ export default {
},
elementChanged (opts) {
let elem = opts.elems[0];
if (elem && elem.tagName === 'svg' && elem.id === 'svgcontent') {
if (!elem) return;
if (elem.tagName === 'svg' && elem.id === 'svgcontent') {
// Update svgcontent (can change on import)
svgcontent = elem;
init();
}
// Has marker, so change offset
if (elem && (
if (
elem.getAttribute('marker-start') ||
elem.getAttribute('marker-mid') ||
elem.getAttribute('marker-end')
)) {
) {
const start = elem.getAttribute('marker-start');
const mid = elem.getAttribute('marker-mid');
const end = elem.getAttribute('marker-end');

4
editor/history.js
View File

@ -223,7 +223,7 @@ export class InsertElementCommand extends Command {
}
this.parent = this.elem.parentNode;
this.elem = this.elem.remove();
this.elem.remove();
if (handler) {
handler.handleHistoryEvent(HistoryEventTypes.AFTER_UNAPPLY, this);
@ -280,7 +280,7 @@ export class RemoveElementCommand extends Command {
removeElementFromListMap(this.elem);
this.parent = this.elem.parentNode;
this.elem = this.elem.remove();
this.elem.remove();
if (handler) {
handler.handleHistoryEvent(HistoryEventTypes.AFTER_APPLY, this);

2
editor/svgcanvas.js
View File

@ -516,7 +516,7 @@ const undoMgr = canvas.undoMgr = new UndoManager({
} else if (!isApply) {
restoreRefElems(cmd.elem);
}
if (cmd.elem.tagName === 'use') {
if (cmd.elem && cmd.elem.tagName === 'use') {
setUseData(cmd.elem);
}
} else if (cmdType === ChangeElementCommand.type()) {