Skip to content

Commit d4d97dd

Browse files
authored
Merge pull request #24 from LOLDragoon/windows
Windows
2 parents 9137d95 + bd9afd0 commit d4d97dd

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/App.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ let redoMixin = {
123123
ignoredActions.has(this.doneAction[this.doneAction.length - 1].type)){
124124
this.undoneAction.push(this.doneAction.pop())
125125
}
126+
// if we get here, that means we have undone all "useless" actions
127+
// so we have to do one more final pop and push, have to make sure it isn't null though
126128
let finalPop = this.doneAction.pop()
127129
if(finalPop !== undefined){
128130
this.undoneAction.push(finalPop)
129131
}
130132
}
131-
// if we get here, that means we have undone all "useless" actions
132-
// so we have to do one more final pop and push, have to make sure it isn't null though
133133
134134
}
135135

src/store/mutations.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,9 @@ const mutations = {
424424
*/
425425
[types.IMPORT_IMAGE]: (state, payload) => {
426426
console.log(`import image invoked. image: ${payload.img} ${payload.route}`)
427-
state.imagePath = { ...state.imagePath, [payload.route]: payload.img }
427+
428+
console.log(payload.img.replace(/\\/g,"/"))
429+
state.imagePath = { ...state.imagePath, [payload.route]: payload.img.replace(/\\/g,"/") }
428430
// state.imagePath[payload.route] = payload.img
429431
},
430432
[types.CLEAR_IMAGE]: (state, payload) => {

0 commit comments

Comments
 (0)