Merge branch 'nesting' of https://github.com/keliphan/OverVue into keriannmerge

Author: LOLDragoon

src/components/HomeQueue.vue

@@ -45,10 +45,11 @@ export default {
     renderList: {
       get () {
         if (this.activeComponent === '') return this.selectedElementList
-        let newArr = this.componentMap[this.activeComponent].htmlList.map((el, index) => [el.text, index]).filter(el => {
+        // change activeComponent's htmlList into an array of arrays ([element/component name, index in state])
+        let sortedHTML = this.componentMap[this.activeComponent].htmlList.map((el, index) => [el.text, index]).filter(el => {
           return el[0] !== undefined
         })
-        return newArr
+        return sortedHTML
       },
       set (value) {
         this.$store.dispatch(setSelectedElementList, value)

src/store/mutations.js

@@ -185,6 +185,7 @@ const mutations = {
       children.forEach((child, index) => {
         if (activeComponent === child) {
           children.splice(index, 1)
+          // removes component from activeComponent's htmlList
           newObj[compKey].htmlList = newObj[compKey].htmlList.filter(el => el !== activeComponent)
         }
       })