Skip to content

Commit 6b62fbe

Browse files
Dean OhashiDean Ohashi
Dean Ohashi
authored and
Dean Ohashi
committed
resolving conflicts
2 parents f862cc5 + c6c0e73 commit 6b62fbe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+353
-156
lines changed

‎src/components/ComponentDisplay.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ export default {
7878
window.addEventListener('keyup', event => {
7979
if (event.key === 'Backspace') {
8080
if (this.activeComponent && this.activeComponentData.isActive) {
81+
// console.log('this:', this)
8182
this.$store.dispatch('deleteActiveComponent')
8283
}
8384
}

‎src/components/HomeSideDropDownItems/ComponentList.vue‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@ export default {
4444
}
4545
},
4646
methods: {
47-
...mapActions(['setActiveComponent','deleteComponent']),
47+
...mapActions(['setActiveComponent','deleteComponent', 'deleteActiveComponent']),
4848
onActivated (componentData) {
4949
this.setActiveComponent(componentData.componentName)
5050
this.activeComponentData.isActive = true
5151
},
5252
handleClick (componentData) {
53-
this.deleteComponent(componentData)
54-
this.setActiveComponent('')
53+
54+
this.setActiveComponent(componentData.componentName)
55+
this.deleteActiveComponent(componentData.componentName)
56+
5557
}
5658
}
5759
}

‎test/jest/coverage/clover.xml‎

Lines changed: 55 additions & 50 deletions
Large diffs are not rendered by default.

‎test/jest/coverage/coverage-final.json‎

Lines changed: 34 additions & 34 deletions
Large diffs are not rendered by default.

‎test/jest/coverage/lcov-report/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,11 @@ <h1>
197197
</div><!-- /wrapper -->
198198
<div class='footer quiet pad2 space-top1 center small'>
199199
Code coverage
200+
<<<<<<< HEAD
200201
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:35:03 GMT-0700 (Pacific Daylight Time)
202+
=======
203+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:33:32 GMT-0700 (Pacific Daylight Time)
204+
>>>>>>> c6c0e7321f6241a0fb032c3473e37f10f84cbd62
201205
</div>
202206
</div>
203207
<script src="prettify.js"></script>

‎test/jest/coverage/lcov-report/src-electron/main-process/electron-main.dev.js.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,11 @@ <h1>
118118
</div><!-- /wrapper -->
119119
<div class='footer quiet pad2 space-top1 center small'>
120120
Code coverage
121+
<<<<<<< HEAD
121122
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:35:03 GMT-0700 (Pacific Daylight Time)
123+
=======
124+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:33:32 GMT-0700 (Pacific Daylight Time)
125+
>>>>>>> c6c0e7321f6241a0fb032c3473e37f10f84cbd62
122126
</div>
123127
</div>
124128
<script src="../../prettify.js"></script>

‎test/jest/coverage/lcov-report/src-electron/main-process/electron-main.js.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,11 @@ <h1>
187187
</div><!-- /wrapper -->
188188
<div class='footer quiet pad2 space-top1 center small'>
189189
Code coverage
190+
<<<<<<< HEAD
190191
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:35:03 GMT-0700 (Pacific Daylight Time)
192+
=======
193+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:33:32 GMT-0700 (Pacific Daylight Time)
194+
>>>>>>> c6c0e7321f6241a0fb032c3473e37f10f84cbd62
191195
</div>
192196
</div>
193197
<script src="../../prettify.js"></script>

‎test/jest/coverage/lcov-report/src-electron/main-process/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ <h1>
9393
</div><!-- /wrapper -->
9494
<div class='footer quiet pad2 space-top1 center small'>
9595
Code coverage
96+
<<<<<<< HEAD
9697
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:35:03 GMT-0700 (Pacific Daylight Time)
98+
=======
99+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:33:32 GMT-0700 (Pacific Daylight Time)
100+
>>>>>>> c6c0e7321f6241a0fb032c3473e37f10f84cbd62
97101
</div>
98102
</div>
99103
<script src="../../prettify.js"></script>

‎test/jest/coverage/lcov-report/src-pwa/custom-service-worker.js.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ <h1>
6767
</div><!-- /wrapper -->
6868
<div class='footer quiet pad2 space-top1 center small'>
6969
Code coverage
70+
<<<<<<< HEAD
7071
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:35:03 GMT-0700 (Pacific Daylight Time)
72+
=======
73+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:33:32 GMT-0700 (Pacific Daylight Time)
74+
>>>>>>> c6c0e7321f6241a0fb032c3473e37f10f84cbd62
7175
</div>
7276
</div>
7377
<script src="../prettify.js"></script>

‎test/jest/coverage/lcov-report/src-pwa/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ <h1>
9393
</div><!-- /wrapper -->
9494
<div class='footer quiet pad2 space-top1 center small'>
9595
Code coverage
96+
<<<<<<< HEAD
9697
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:35:03 GMT-0700 (Pacific Daylight Time)
98+
=======
99+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 11:33:32 GMT-0700 (Pacific Daylight Time)
100+
>>>>>>> c6c0e7321f6241a0fb032c3473e37f10f84cbd62
97101
</div>
98102
</div>
99103
<script src="../prettify.js"></script>

0 commit comments

Comments
 (0)