From 11416d4b35a565170bed0dd0bf4ea89ec24b7b11 Mon Sep 17 00:00:00 2001
From: nuintun <nuintun@qq.com>
Date: Thu, 7 Jul 2016 16:15:12 +0800
Subject: [PATCH] update vue lib

---
 bin/app-configure.js                         |  9 +++++----
 bin/open-directory.js                        |  5 +++--
 bin/thread.js                                |  3 ++-
 bin/window-control.js                        |  3 ++-
 main.js                                      | 11 ++++++-----
 static/js/app/index.js                       |  3 ++-
 static/js/components/app-configure/index.js  |  5 +++--
 static/js/components/app-main/index.js       |  5 +++--
 static/js/components/directory/index.js      |  3 ++-
 static/js/components/window-control/index.js |  3 ++-
 10 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/bin/app-configure.js b/bin/app-configure.js
index 62225dc..fd84535 100644
--- a/bin/app-configure.js
+++ b/bin/app-configure.js
@@ -8,10 +8,11 @@ var fs = require('fs');
 var path = require('path');
 var join = path.join;
 // module to control application life
-var app = require('app');
-var ipc = require('ipc-main');
-var dialog = require('dialog');
-var shell = require('shell');
+var electron = require('electron');
+var app = electron.app;
+var ipc = electron.ipcMain;
+var dialog = electron.dialog;
+var shell = electron.shell;
 
 const USERDATA = app.getPath('userData');
 const USERDESKTOP = app.getPath('userDesktop');
diff --git a/bin/open-directory.js b/bin/open-directory.js
index 327cf97..b26af19 100644
--- a/bin/open-directory.js
+++ b/bin/open-directory.js
@@ -5,8 +5,9 @@
 'use strict';
 
 // module to control application life
-var ipc = require('ipc-main');
-var dialog = require('dialog');
+var electron = require('electron');
+var ipc = electron.ipcMain;
+var dialog = electron.dialog;
 
 /**
  * open directory
diff --git a/bin/thread.js b/bin/thread.js
index 3e22cfe..c31aa85 100644
--- a/bin/thread.js
+++ b/bin/thread.js
@@ -5,7 +5,8 @@
 'use strict';
 
 var path = require('path');
-var ipc = require('ipc-main');
+var electron = require('electron');
+var ipc = electron.ipcMain;
 var iconv = require('iconv-lite');
 var jschardet = require('jschardet');
 var Emulator = require('./emulator');
diff --git a/bin/window-control.js b/bin/window-control.js
index cea6f61..47b01ef 100644
--- a/bin/window-control.js
+++ b/bin/window-control.js
@@ -5,7 +5,8 @@
 'use strict';
 
 // module to control application life
-var ipc = require('ipc-main');
+var electron = require('electron');
+var ipc = electron.ipcMain;
 
 /**
  * window control
diff --git a/main.js b/main.js
index f3af99f..4c9890b 100644
--- a/main.js
+++ b/main.js
@@ -7,11 +7,12 @@
 // node module
 var path = require('path');
 // module to control application life
-var app = require('app');
-var Menu = require('menu');
-var Tray = require('tray');
+var electron = require('electron');
+var app = electron.app;
+var Menu = electron.Menu;
+var Tray = electron.Tray;
 // module to create native browser window
-var BrowserWindow = require('browser-window');
+var BrowserWindow = electron.BrowserWindow;
 // custom module
 var windowControl = require('./bin/window-control');
 var openDirectory = require('./bin/open-directory');
@@ -91,4 +92,4 @@ app.on('ready', function (){
 
   // emulator start
   thread.start();
-});
\ No newline at end of file
+});
diff --git a/static/js/app/index.js b/static/js/app/index.js
index 245dbfb..0f5f4b9 100644
--- a/static/js/app/index.js
+++ b/static/js/app/index.js
@@ -4,7 +4,8 @@
 
 'use strict';
 
-var ipc = require('ipc-renderer');
+var electron = require('electron');
+var ipc = electron.ipcRenderer;
 var util = require('../util');
 var Vue = require('../vue/vue');
 
diff --git a/static/js/components/app-configure/index.js b/static/js/components/app-configure/index.js
index 2f515ff..80dabb8 100644
--- a/static/js/components/app-configure/index.js
+++ b/static/js/components/app-configure/index.js
@@ -6,7 +6,8 @@
 
 var fs = require('fs');
 var path = require('path');
-var ipc = require('ipc-renderer');
+var electron = require('electron');
+var ipc = electron.ipcRenderer;
 var Vue = require('../../vue/vue');
 
 require('../project-base');
@@ -49,7 +50,7 @@ module.exports = Vue.component('app-configure', {
       if (base.isValid()) {
         // hide popup
         this.showPopup = false;
-        
+
         // add
         this.configure.projects.push({
           name: this.name,
diff --git a/static/js/components/app-main/index.js b/static/js/components/app-main/index.js
index 186b36a..4acc239 100644
--- a/static/js/components/app-main/index.js
+++ b/static/js/components/app-main/index.js
@@ -4,7 +4,8 @@
 
 'use strict';
 
-var ipc = require('ipc-renderer');
+var electron = require('electron');
+var ipc = electron.ipcRenderer;
 
 var fs = require('fs');
 var path = require('path');
@@ -236,4 +237,4 @@ module.exports = Vue.component('app-main', {
       }
     }, false);
   }
-});
\ No newline at end of file
+});
diff --git a/static/js/components/directory/index.js b/static/js/components/directory/index.js
index da6b8e0..8a01133 100644
--- a/static/js/components/directory/index.js
+++ b/static/js/components/directory/index.js
@@ -6,7 +6,8 @@
 
 var fs = require('fs');
 var path = require('path');
-var ipc = require('ipc-renderer');
+var electron = require('electron');
+var ipc = electron.ipcRenderer;
 var Vue = require('../../vue/vue');
 
 module.exports = Vue.component('directory', {
diff --git a/static/js/components/window-control/index.js b/static/js/components/window-control/index.js
index 6de17a8..1539397 100644
--- a/static/js/components/window-control/index.js
+++ b/static/js/components/window-control/index.js
@@ -6,7 +6,8 @@
 
 var fs = require('fs');
 var path = require('path');
-var ipc = require('ipc-renderer');
+var electron = require('electron');
+var ipc = electron.ipcRenderer;
 var Vue = require('../../vue/vue');
 
 module.exports = Vue.component('window-control', {