From 15c2f75be977d316bb839b852d626ae50747d7c6 Mon Sep 17 00:00:00 2001 From: life Date: Sun, 22 May 2016 12:17:16 +0800 Subject: [PATCH] upgrade to electron v1.1.1 --- main.js | 15 ++++++++++----- node_modules/db_client.js | 2 +- node_modules/gui.js | 11 +++++------ node_modules/leanote_protocol.js | 3 +-- node_modules/nedb_proxy.js | 2 +- node_modules/pdf_main.js | 5 ++--- public/config.js | 2 +- public/js/app/api.js | 2 +- public/js/app/page.js | 4 +++- public/js/app/service.js | 8 ++------ public/js/app/service_login.js | 2 +- public/js/common.js | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/main.js b/main.js index 0b075e11..1bc49ec9 100644 --- a/main.js +++ b/main.js @@ -1,10 +1,15 @@ -var app = require('app'); // Module to control application life. -var BrowserWindow = require('browser-window'); // Module to create native browser window. -var ipc = require('ipc'); +// var app = require('electron').app; // Module to control application life. +const {app, BrowserWindow, crashReporter} = require('electron'); +var ipc = require('electron').ipcMain; var pdfMain = require('pdf_main'); // Report crashes to our server. -require('crash-reporter').start(); +crashReporter.start({ + productName: 'YourName', + companyName: 'YourCompany', + submitURL: 'https://your-domain.com/url-to-submit', + autoSubmit: true +}); // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the javascript object is GCed. @@ -101,7 +106,7 @@ function openIt() { console.log('load: file://' + __dirname + '/note.html'); // and load the index.html of the app. - mainWindow.loadUrl('file://' + __dirname + '/note.html'); + mainWindow.loadURL('file://' + __dirname + '/note.html'); // Emitted when the window is closed. mainWindow.on('closed', function() { diff --git a/node_modules/db_client.js b/node_modules/db_client.js index b5946f5b..950df2e5 100644 --- a/node_modules/db_client.js +++ b/node_modules/db_client.js @@ -5,7 +5,7 @@ var DatastoreProxy = require('nedb_proxy'); var path = require('path'); var Evt = require('evt'); -var ipc = require('ipc'); +var ipc = require('electron').ipcRenderer; // console.log(dbPath); // g, 表全局环境 diff --git a/node_modules/gui.js b/node_modules/gui.js index 6616c634..8e17e954 100644 --- a/node_modules/gui.js +++ b/node_modules/gui.js @@ -1,13 +1,12 @@ -var remote = require('remote'); -var dialog = remote.require('dialog'); -var Menu = remote.require('menu'); -var MenuItem = remote.require('menu-item'); +const {dialog, Menu, MenuItem, app} = require('electron').remote; +var remote = require('electron').remote; + // var dialog = require('dialog'); var gui = { Menu: Menu, MenuItem: MenuItem, remote: remote, - app: remote.require('app'), + app: app, dialog: dialog, getSeparatorMenu: function() { @@ -17,7 +16,7 @@ var gui = { getCurrentWindow: function() { return remote.getCurrentWindow(); }, - Shell: require('shell'), + Shell: require('electron').shell, on: function(type, callback) { } diff --git a/node_modules/leanote_protocol.js b/node_modules/leanote_protocol.js index bc12458f..c9f4a6df 100644 --- a/node_modules/leanote_protocol.js +++ b/node_modules/leanote_protocol.js @@ -1,6 +1,5 @@ -var protocol = require('protocol'); +const {app, protocol} = require('electron'); var File = require('file_main'); -var app = require('app'); var leanoteProtocol = { destroy: function (callback) { diff --git a/node_modules/nedb_proxy.js b/node_modules/nedb_proxy.js index 5e6ddcbb..d54b1451 100644 --- a/node_modules/nedb_proxy.js +++ b/node_modules/nedb_proxy.js @@ -1,4 +1,4 @@ -var ipc = require('ipc'); +var ipc = require('electron').ipcRenderer; function Find(dbProxy, dbname, query) { this.query = query; diff --git a/node_modules/pdf_main.js b/node_modules/pdf_main.js index 7830af79..6eaa9bd8 100644 --- a/node_modules/pdf_main.js +++ b/node_modules/pdf_main.js @@ -1,6 +1,5 @@ -var app = require('app'); -var BrowserWindow = require('browser-window'); -var ipc = require('ipc'); +const {app, BrowserWindow} = require('electron'); +var ipc = require('electron').ipcMain; var fs = require('fs'); var exportPdf = { diff --git a/public/config.js b/public/config.js index f50764df..4c967e58 100644 --- a/public/config.js +++ b/public/config.js @@ -29,6 +29,6 @@ var Config = { "name": "日本語" } ], - "lang": "en-us", + "lang": "zh-cn", "theme": "" }; \ No newline at end of file diff --git a/public/js/app/api.js b/public/js/app/api.js index d7b3facd..985846ba 100644 --- a/public/js/app/api.js +++ b/public/js/app/api.js @@ -17,7 +17,7 @@ var Api = { noteService: NoteService, userService: UserService, dbService: db, - ipc: nodeRequire('ipc'), + ipc: nodeRequire('electron').ipcRenderer, // 打开本地目录 // mac和windows下不同 diff --git a/public/js/app/page.js b/public/js/app/page.js index 21a3c8ed..7ad14e32 100644 --- a/public/js/app/page.js +++ b/public/js/app/page.js @@ -1432,7 +1432,9 @@ function initPage(initedCallback) { gui.win.on('blur', function() { }); */ - var ipc = require('ipc'); + // var ipc = require('ipc'); + const {ipcRenderer} = require('electron'); + ipc = ipcRenderer; ipc.on('focusWindow', function(arg) { $('body').removeClass('blur'); }); diff --git a/public/js/app/service.js b/public/js/app/service.js index 46c8a2f8..bc6c9c26 100644 --- a/public/js/app/service.js +++ b/public/js/app/service.js @@ -1,16 +1,14 @@ var Common = require('common'); var Evt = require('evt'); -var app = require('remote').require('app'); +var app = require('electron').remote.app; // .require('app'); var basePath = app.getPath('appData') + '/leanote'; // /Users/life/Library/Application Support/Leanote'; // require('nw.gui').App.dataPath; Evt.setDataBasePath(basePath); -var protocol = require('remote').require('protocol'); - +var protocol = require('electron').protocol; // .require('protocol'); // 数据库初始化 var db = require('db'); // db.init(); db.initGlobal(); - // 所有service, 与数据库打交道 var Service = { notebookService: require('notebook'), @@ -20,7 +18,6 @@ var Service = { apiService: require('api'), syncServie: require('sync') }; - // 全局变量 var ApiService = Service.apiService; var UserService = Service.userService; @@ -40,6 +37,5 @@ var NodeFs = require('fs'); // route = /note/notebook // 过时 Service.dispatch = function() {}; - var gui = require('gui'); // var remote = require('remote'); diff --git a/public/js/app/service_login.js b/public/js/app/service_login.js index 77c004f5..8cb9be6f 100644 --- a/public/js/app/service_login.js +++ b/public/js/app/service_login.js @@ -1,7 +1,7 @@ var Common = require('common'); var Evt = require('evt'); -var app = require('remote').require('app'); +var app = require('electron').app; // .require('app'); var basePath = app.getPath('appData') + '/leanote'; // /Users/life/Library/Application Support/Leanote'; // require('nw.gui').App.dataPath; Evt.setDataBasePath(basePath); diff --git a/public/js/common.js b/public/js/common.js index b320ebc8..61320ed1 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -445,7 +445,7 @@ function _setEditorContent(content, isMarkdown, preview, callback) { // 复制图片 // 在web端得到图片 -var clipboard = require('clipboard'); +const {clipboard} = require('electron'); function pasteImage(e) { var image = clipboard.readImage(); if(image) {