Merge branch 'dev'

nashaofu · Feb 8, 2018 · 228da65 · 228da65
2 parents 27d952e + 2783a1a
commit 228da65
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/app/dingtalk.js b/app/dingtalk.js
@@ -12,8 +12,8 @@ const {
   dialog
 } = require('electron')
 
-const download = require('./plugins/download')
-const shortcutCapture = require('./plugins/shortcut-capture')
+const download = require('./download')
+const shortcutCapture = require('./shortcut-capture')
 
 exports = module.exports = class DingTalk {
   // 构造函数
@@ -449,7 +449,7 @@ exports = module.exports = class DingTalk {
       this.$errorWindow = null
     })
     // 加载URL地址
-    this.$errorWindow.loadURL(`file://${__dirname}/views/error.html`)
+    this.$errorWindow.loadURL(`file://${__dirname}/views/shortcut-capture.html`)
   }
 
   /**

diff --git a/app/plugins/download.js → app/download.js b/app/plugins/download.js → app/download.js
diff --git a/app/plugins/shortcut-capture-renderer.js → app/shortcut-capture-renderer.js b/app/plugins/shortcut-capture-renderer.js → app/shortcut-capture-renderer.js
diff --git a/app/plugins/shortcut-capture.js → app/shortcut-capture.js b/app/plugins/shortcut-capture.js → app/shortcut-capture.js
@@ -1,5 +1,4 @@
 const {
-  app,
   globalShortcut,
   ipcMain,
   BrowserWindow,
@@ -103,8 +102,8 @@ function createWindow (source, setting) {
     $win.webContents.send('dom-ready', { source, setting })
     $win.focus()
   })
-  const filename = path.join(app.getAppPath(), './app/views/shortcut-capture.html')
-  $win.loadURL(filename)
+  $win.loadURL(`file://${__dirname}/views/shortcut-capture.html`)
+  $win.webContents.openDevTools()
   $windows.push($win)
 }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dingtalk",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "钉钉linux桌面版，基于electron开发",
   "main": "./app/index.js",
   "scripts": {