Merge branch 'Johnny' of https://github.com/oslabs-beta/OverVue into Johnny

Author: jchan444

src/components/Canvas.vue

@@ -289,20 +289,20 @@ export default {
   },
   mounted() {
     // when component is mounted, add ability to delete
-    window.addEventListener("keyup", (event) => {
-      if (event.key === "Backspace") {
-        if (this.activeComponent !== '' && this.noteModalOpen === false) {
-          this.$store.dispatch("deleteActiveComponent");
-        }
-      }
-    });
-    window.addEventListener("keyup", (event) => {
-      if (event.key === "Delete") {
-        if (this.activeComponent !== '' && this.noteModalOpen === false) {
-          this.$store.dispatch("deleteActiveComponent");
-        }
-      }
-    });
+    // window.addEventListener("keyup", (event) => {
+    //   if (event.key === "Backspace") {
+    //     if (this.activeComponent !== '' && this.noteModalOpen === false) {
+    //       this.$store.dispatch("deleteActiveComponent");
+    //     }
+    //   }
+    // });
+    // window.addEventListener("keyup", (event) => {
+    //   if (event.key === "Delete") {
+    //     if (this.activeComponent !== '' && this.noteModalOpen === false) {
+    //       this.$store.dispatch("deleteActiveComponent");
+    //     }
+    //   }
+    // });
     // listener for the copy
     window.addEventListener("copy", () => {
       // if there is an activeComponent, copy info to state using dispatch

src/components/right-sidebar/HTMLQueue.vue

@@ -50,6 +50,14 @@ Description:
           :key="element.id + Date.now()">
           <p v-if="element.id === this.activeHTML">Your class is - {{ element.class }}</p>
         </div>
+      <!--attribute child's child-->
+        <div class="AttributeContainer" v-for="element in this.componentMap[this.activeComponent].htmlList"
+          :key="element.id + Date.now()">
+          <ul v-for="element1 in element.children"
+          :key="element1.id + Date.now()">
+            <li v-if="element1.id === this.activeHTML">Your class is - {{ element1.class }}</li>
+          </ul>
+        </div>
 
         <!--attribute child's child-->
         <div class="AttributeContainer" v-for="element in this.componentMap[this.activeComponent].htmlList"

src/store/mutations.js

@@ -430,6 +430,7 @@ const mutations = {
 
   [types.SET_ACTIVE_LAYER]: (state, payload) => {
     const newLayer = cloneDeep(state.activeLayer);
+
     newLayer.lineage.push(payload.text);
     newLayer.id = payload.id;
     state.activeLayer = newLayer;
@@ -819,6 +820,7 @@ const mutations = {
         el.class = payload.class
       }
     })
+
   },