leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2026-01-13 07:03:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

support electron 12.0.2

Browse Source
This commit is contained in:
life
2021-03-26 17:39:55 +08:00
parent c7351bcd79
commit 8735298855
7 changed files with 151 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/version.md
View File

@@ -6,4 +6,5 @@
/Users/life/app/electron-v4.1.4-darwin-x64/Electron.app/Contents/MacOS/Electron .
/Users/life/app/electron-v9.0.0-beta.9-darwin-x64/Electron.app/Contents/MacOS/Electron .
/Users/life/app/electron-v9.0.0-darwin-x64/Electron.app/Contents/MacOS/Electron .
/Users/life/app/electron-v12.0.2-darwin-x64/Electron.app/Contents/MacOS/Electron .

16
main.js
View File

@@ -1,9 +1,5 @@
// var app = require('electron').app; // Module to control application life.
const {app, BrowserWindow, crashReporter} = require('electron');
var ipc = require('electron').ipcMain;
const electron = require('electron');
const Menu = electron.Menu
const Tray = electron.Tray
const {app, BrowserWindow, crashReporter, Tray, Menu, ipcMain: ipc} = require('electron');
var pdfMain = require('pdf_main');
var appIcon;
@@ -15,6 +11,7 @@ crashReporter.start({
autoSubmit: true
});
require('@electron/remote/main').initialize()
// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the javascript object is GCed.
@@ -206,7 +203,9 @@ function openIt() {
transparent: false,
autoHideMenuBar: true,
webPreferences: {
nodeIntegration: true
nodeIntegration: true,
contextIsolation: false, // https://github.com/electron/electron/issues/27961
enableRemoteModule: true
}
}
);
@@ -235,9 +234,14 @@ function openIt() {
arg.webPreferences = arg.webPreferences === undefined ? {} : arg.webPreferences;
arg.webPreferences.nodeIntegration = true;
arg.webPreferences.contextIsolation = false;
arg.webPreferences.enableRemoteModule = false;
var html = arg.html;
var everWindow = mainWindow;
if (arg.icon) {
arg.icon = new Tray(__dirname + arg.icon)
}
var win2 = new BrowserWindow(arg);
win2.loadURL('file://' + __dirname + '/' + html);
mainWindow = win2;

128
package-lock.json generated Normal file
View File

@@ -0,0 +1,128 @@
{
"name": "Leanote",
"version": "0.7",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@electron/remote": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/@electron/remote/-/remote-1.0.4.tgz",
"integrity": "sha512-kguDJRhL3ZynHrkbX8Tr7xoAzGsNgh4eqXkycXb6cgXbOgehGqkBVe+MnjSVMXz3QJykerGKPy28gqcM7AFGYw=="
},
"adm-zip": {
"version": "0.4.7",
"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
"integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E="
},
"async": {
"version": "0.9.0"
},
"iconv-lite": {
"version": "0.4.15",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
},
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
"integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc="
},
"nedb": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/nedb/-/nedb-1.1.1.tgz",
"integrity": "sha1-rhccePrZGcCqr9CHbbwrTdKinsk=",
"requires": {
"async": "0.2.10",
"binary-search-tree": "0.2.4",
"mkdirp": "~0.3.5",
"underscore": "~1.4.4"
},
"dependencies": {
"async": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
"integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
},
"binary-search-tree": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz",
"integrity": "sha1-FP4QY2alnKjvtowK4ww2qv8M1RA=",
"requires": {
"underscore": "~1.4.4"
}
}
}
},
"needle": {
"version": "0.7.10",
"resolved": "https://registry.npmjs.org/needle/-/needle-0.7.10.tgz",
"integrity": "sha1-4cLbkgufr95GcJzF6fSqh8JZZW0=",
"requires": {
"iconv-lite": "^0.4.4"
},
"dependencies": {
"iconv-lite": {
"version": "0.4.6",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.6.tgz",
"integrity": "sha1-45xoJhCnkfPu3Cc4L/SeJj+R+gk="
}
}
},
"node-getmac": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/node-getmac/-/node-getmac-1.0.3.tgz",
"integrity": "sha1-0qol5A+uEXYjAjgbAw1YsON9aGo="
},
"resanitize": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/resanitize/-/resanitize-0.3.0.tgz",
"integrity": "sha1-38sr8q4d8oOEOe1s0Ex4hFxTI1M=",
"requires": {
"validator": "~1.5.1"
},
"dependencies": {
"validator": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/validator/-/validator-1.5.1.tgz",
"integrity": "sha1-erNWy7y7sACrhcQ7jNoSYhsTRMA="
}
}
},
"underscore": {
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
"integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ="
},
"xml2js": {
"version": "0.4.6",
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.6.tgz",
"integrity": "sha1-oEFsbwxSRhE/RwZVegu2T/83hus=",
"requires": {
"sax": "0.6.x",
"xmlbuilder": ">=2.4.6"
},
"dependencies": {
"sax": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
"integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk="
},
"xmlbuilder": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
"integrity": "sha1-+Rb20Q1F3BcbG+Lm5nP7bgzDXQo=",
"requires": {
"lodash": "~3.5.0"
},
"dependencies": {
"lodash": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz",
"integrity": "sha1-Gbs/TVEnjwuMgY7RRcdOz5/kDm0="
}
}
}
}
}
}
}

11
package.json
View File

@@ -1,5 +1,8 @@
{
"name" : "Leanote",
"version" : "0.7",
"main" : "main.js"
}
"name": "Leanote",
"version": "0.7",
"main": "main.js",
"dependencies": {
"@electron/remote": "^1.0.4"
}
}

2
public/js/app/service.js
View File

@@ -1,7 +1,7 @@
var Common = require('common');
var Evt = require('evt');
var app = require('electron').remote.app; // .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('electron').protocol; // .require('protocol');

2
public/js/app/service_login.js
View File

@@ -1,7 +1,7 @@
var Common = require('common');
var Evt = require('evt');
var app = require('electron').remote.app; // .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);

4
public/js/common.js
View File

@@ -1579,7 +1579,7 @@ function isMac() {
function getMainWinParams() {
if(isMac()) {
return {
"icon": "public/images/logo/leanote_icon_blue.png",
"icon": "/public/images/logo/leanote.png",
frame: false,
transparent: false,
width: 258,
@@ -1589,7 +1589,7 @@ function getMainWinParams() {
};
}
return {
"icon": "public/images/logo/leanote_icon_blue.png",
"icon": "/public/images/logo/leanote.png",
frame: true,
transparent: false,
width: 1100,