fixed build issue

Plagiatus · Feb 19, 2021 · a99852c · a99852c
1 parent 7cf5f74
commit a99852c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/renderer/components/Compare.vue b/src/renderer/components/Compare.vue
@@ -4,7 +4,7 @@
     <div v-else id="compare">
       <div>
         Compare
-        <input type="file" @change="newJarFile" v-if="useFileSelector">
+        <input type="file" v-if="useFileSelector">
         <select
           v-else
           :disabled="comparing"
@@ -16,7 +16,7 @@
           <option v-for="o in options" :key="o" :value="o">{{ o }}</option>
         </select>
         to
-        <input type="file" @change="oldJarFile" v-if="useFileSelector">
+        <input type="file" v-if="useFileSelector">
         <select
           v-else
           :disabled="comparing"
@@ -185,9 +185,6 @@ export default Vue.extend({
     unlock() {
       this.comparing = false;
       console.log(this.comparing);
-    },
-    newJarFile(e) {
-      console.log(e.currentTarget.value);
     }
   },
   data() {

diff --git a/src/renderer/components/Comparison/FileBrowser.vue b/src/renderer/components/Comparison/FileBrowser.vue
@@ -34,10 +34,9 @@ export default Vue.extend({
           parent = folder;
         }
         let item = this.makeNode(parent, path[0]);
-        item = {
-          ...item,
-          ...this.files[file],
-        };
+        for (let key in this.files[file]) {
+          item[key] = this.files[file][key] || item[key] || 0;
+        }
         this.addItem(parent, item);
       }
       console.log(this.rootData);