Skip to content

Commit 78fc341

Browse files
committed
tidying up the merges
1 parent f28a4a8 commit 78fc341

File tree

8 files changed

+12
-5
lines changed

8 files changed

+12
-5
lines changed

src/components/left-sidebar/ComponentTab/AttributesSubMenu.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export default {
7474
</script>
7575

7676
<script setup>
77+
// new script for Composition API
7778
import { computed, ref } from "vue";
7879
import { useStore } from "vuex";
7980
import VueMultiselect from "vue-multiselect";

src/components/left-sidebar/ComponentTab/ComponentTab.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Functionality includes: if active component is selected, will switch view to edi
99

1010

1111
<script setup>
12+
// new script for Composition API
1213
import CreateMenu from './CreateMenu.vue';
1314
import UpdateMenu from './UpdateMenu.vue';
1415
import { computed } from "vue";

src/components/left-sidebar/ComponentTab/CreateMenu.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Description:
100100
</script>
101101

102102
<script setup>
103+
// new script for Composition API
103104
import { useCreateComponent } from "../../composables/useCreateComponent.js";
104105
import { computed, ref, watch } from "vue";
105106
import { useStore } from "vuex";

src/components/left-sidebar/ComponentTab/CreateMenuHTMLQueue.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Description:
4040
</script>
4141

4242
<script setup>
43-
43+
// new script for Composition API
4444
import { setSelectedElementList, deleteSelectedElement, deleteFromComponentHtmlList } from '../../../store/types'
4545
import { breadthFirstSearch } from '../../../utils/search.util'
4646
import { computed, ref, watch, defineProps } from "vue";
@@ -176,7 +176,7 @@ const renderList = computed({
176176
</script>
177177

178178
<!-- <script>
179-
179+
//old Options API script
180180
import { mapState, mapActions } from 'vuex'
181181
import { setSelectedElementList, deleteSelectedElement, deleteFromComponentHtmlList } from '../../../store/types'
182182
import { breadthFirstSearch } from '../../../utils/search.util'

src/components/left-sidebar/ComponentTab/Icons.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default {
3737
</script>
3838

3939
<script setup>
40-
40+
// new script for Composition API
4141
import { computed, ref, defineEmits } from "vue";
4242
import { useStore } from "vuex";
4343
@@ -125,6 +125,7 @@ const changeState = (elementName) => {
125125
</script>
126126

127127
<!-- <script>
128+
//old Options API script
128129
import { mapState } from "vuex";
129130
130131
export default {

src/components/left-sidebar/ComponentTab/ImportComponent.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</template>
66

77
<script setup>
8-
8+
// new script for Composition API
99
import { computed, defineProps } from "vue";
1010
import { useStore } from "vuex";
1111
import { useCreateComponent } from "../../composables/useCreateComponent.js";
@@ -349,6 +349,7 @@ const openVueFile = (data) => {
349349
</script>
350350

351351
<!-- <script>
352+
// old Options API script
352353
const { fs, ipcRenderer } = window;
353354
import { useCreateComponent } from "../../composables/useCreateComponent.js";
354355
import { mapState, mapActions } from "vuex";

src/components/left-sidebar/ComponentTab/ImportLibraryButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default {
1212
</script>
1313

1414
<script setup>
15-
15+
// new script for Composition API
1616
import { computed } from "vue";
1717
import { useStore } from "vuex";
1818

src/components/left-sidebar/ComponentTab/InputHTMLMenu.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
</template>
154154

155155
<script setup>
156+
// new script for Composition API
156157
import { computed, ref, watch, onMounted } from "vue";
157158
import { useStore } from "vuex";
158159
@@ -337,6 +338,7 @@ const addBinding = (input, idNum) => {
337338
</script>
338339

339340
<!-- <script>
341+
//old Options API script
340342
import { mapState, mapActions } from 'vuex'
341343
export default {
342344
data () {

0 commit comments

Comments
 (0)