Merge branch 'master' of github.com:zhuowenli/githuber

zhuowenli · Apr 22, 2018 · 89d63cd · 89d63cd
2 parents 7aee4c1 + 7de7363
commit 89d63cd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/views/components/bookmark.sass b/src/views/components/bookmark.sass
@@ -21,6 +21,7 @@
         cursor: pointer
         border-bottom: 1px solid #f2f2f2
         transition: all .3s ease
+        user-select: none
         &:last-child
             border-bottom: 0
         .logo

diff --git a/src/views/components/bookmark.vue b/src/views/components/bookmark.vue
@@ -9,11 +9,11 @@
             :options="dragOptions"
         )
             .bookmark__item(
+                @contextmenu="toggleEditAction"
                 v-for="(item, inx) in bookmarks"
                 :key="inx"
                 @click="onLinkTapAction(item)"
                 @dblclick="onEditAction(item)"
-                @contextmenu="onContextMenuAction($event, item)"
                 :class="{edit: edit}"
             )
                 .el-icon-close(@click.stop="onRemoveAction(item)")
@@ -22,7 +22,7 @@
                 .text.shake-constant(v-else) {{item.name[0]}}
                 .name
                     span {{item.name}}
-        .bookmark__item(@click="edit = false" v-if="edit")
+        .bookmark__item(@click="toggleEditAction" v-if="edit")
             .el-icon-check
         .bookmark__item(@click="onAddAction" v-else)
             .el-icon-plus
@@ -46,6 +46,11 @@ export default {
     async mounted() {
         this.init();
     },
+    watch: {
+        bookmarks() {
+            this.$refs.scrollView.refresh();
+        }
+    },
     computed: {
         ...mapGetters('bookmark', ['bookmarks']),
         bookmarkLists: {
@@ -68,7 +73,7 @@ export default {
                 this.$emit('tap', item.url);
             }
         },
-        onContextMenuAction(e) {
+        toggleEditAction(e) {
             e.preventDefault();
             this.edit = !this.edit;
             if (this.edit) {

diff --git a/src/views/components/setting.vue b/src/views/components/setting.vue
@@ -92,7 +92,7 @@ export default {
                     });
                 }
             };
-            reader.readAsBinaryString(file);
+            reader.readAsText(file);
         }
     },
     watch: {