Skip to content

Commit 7381733

Browse files
Merge pull request #37 from oslabs-beta/katherine/whatsnew
Katherine/whatsnew
2 parents dcc4e17 + 5f01f1a commit 7381733

25 files changed

+212
-106
lines changed

src/App.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<template>
22
<!-- Get passed down to MyLayout.vue
33
& listen for custom events emitted from MyLayout.vue -->
4-
<router-view
5-
v-on:undo="undoTrigger"
6-
v-on:redo="redoTrigger"
7-
v-bind:done-action="doneAction"
8-
v-bind:undone-action="undoneAction"
9-
/>
4+
<router-view v-on:undo="undoTrigger" v-on:redo="redoTrigger" v-bind:done-action="doneAction"
5+
v-bind:undone-action="undoneAction" />
106
</template>
117

128
<script>
@@ -44,7 +40,7 @@ let redoMixin = {
4440
if (this.undoneAction[this.undoneAction.length - 1]) {
4541
if (
4642
action.type ===
47-
this.undoneAction[this.undoneAction.length - 1].type &&
43+
this.undoneAction[this.undoneAction.length - 1].type &&
4844
deepEqual(
4945
action.payload,
5046
this.undoneAction[this.undoneAction.length - 1].payload

src/assets/HTMLtag.png

8.37 KB
Loading

src/assets/add-props.png

-1.93 KB
Loading

src/assets/add:removeChild.png

9.59 KB
Loading

src/assets/colorpicker.png

31.8 KB
Loading

src/assets/component-details.png

-30 KB
Loading

src/assets/export.png

6.99 KB
Loading

src/assets/html-queue.png

-6.61 KB
Loading

src/assets/import.png

7.04 KB
Loading

src/assets/inputButton.png

8.01 KB
Loading

0 commit comments

Comments
 (0)