Merge branch 'dev'

xfgryujk · Aug 13, 2018 · 1e6f54e · 1e6f54e
2 parents 8083e72 + 53c2dc0
commit 1e6f54e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weibo-img-crypto",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Automatically encrypt images before uploading them to Weibo.",
   "author": "xfgryujk <[email protected]>",
   "private": true,

diff --git a/src/gui/gui.vue b/src/gui/gui.vue
@@ -6,7 +6,7 @@
       </a>
     </el-tooltip>
 
-    <el-dialog title="weibo-img-crypto v1.3.2" :visible.sync="dialogVisible">
+    <el-dialog title="weibo-img-crypto v1.3.3" :visible.sync="dialogVisible">
       <el-tabs>
         <el-tab-pane label="基础">
           <el-form label-width="100px">

diff --git a/src/hooks.js b/src/hooks.js
@@ -86,10 +86,10 @@ function hookContextMenu () {
     let originImg = event.target
     if (getConfig().enableDecryption &&
         originImg instanceof window.Image) {
-      // event.preventDefault() // 为了右键保存图片这里先注释掉了
       if (originImg.src.startsWith('data:')) { // 如果是'data:'开头说明已经解密过了
         return
       }
+      event.preventDefault() // 解密时屏蔽右键菜单
       decrypt(originImg).then(url => {
         if (url) {
           originImg.src = url

diff --git a/weibo-img-crypto.js b/weibo-img-crypto.js