leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-14 07:00:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #351 from chaosue/master

Browse Source 
fix compatibilies with electron9 for plugins; auto hide default menubar
This commit is contained in:
life
2021-03-26 16:51:35 +08:00
committed by GitHub
parent 338cbbe664 f5903b55bb
commit 5ebfeb9833
9 changed files with 362 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main.js
View File

@@ -204,6 +204,7 @@ function openIt() {
height: 595,
frame: process.platform != 'darwin',
transparent: false,
autoHideMenuBar: true,
webPreferences: {
nodeIntegration: true
}

27
node_modules/pdf_main.js generated vendored
View File

@@ -15,11 +15,7 @@ var exportPdf = {
win.webContents.on('did-finish-load', function() {
console.log('load ok');
setTimeout(function() {
win.webContents.printToPDF({
printBackground: true,
landscape: false,
pageSize: 'A4'
}, function(err, data) {
var callback = function(err, data) {
fs.writeFile(targetPdfPath, data, function(err) {
if (err) {
callbcak(false);
@@ -29,7 +25,26 @@ var exportPdf = {
}
// win.close();
});
})
};
var po = win.webContents.printToPDF({
printBackground: true,
landscape: false,
pageSize: 'A4'
},
callbcak
);
if(typeof(po) != "object"){
return;
}
po.then(data => {
callback(null, data);
}
).catch( err => {
callback(err, null);
}
);
}, isMarkdown ? 1000 : 100);
});

17
public/plugins/export_evernote/plugin.js
View File

@@ -405,7 +405,7 @@ define(function() {
getTargetPath: function(callback) {
// showSaveDialog 不支持property选择文件夹
Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
var po = Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
defaultPath: Api.gui.app.getPath('userDesktop') + '/',
properties: ['openDirectory']
@@ -414,6 +414,21 @@ define(function() {
callback(targetPath);
}
);
if(typeof(po) != "object"){
return;
}
po.then(function(re){
if(re.canceled !== false || re.filePaths.length < 1){
return;
}
callback(re.filePaths[0]);
},
function(err){
alert(err);
}
);
},
loadingIsClosed: false,

16
public/plugins/export_html/plugin.js
View File

@@ -185,7 +185,7 @@ define(function() {
getTargetPath: function(callback) {
// showSaveDialog 不支持property选择文件夹
Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
var po = Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
defaultPath: Api.gui.app.getPath('userDesktop') + '/',
properties: ['openDirectory']
@@ -194,6 +194,20 @@ define(function() {
callback(targetPath);
}
);
if(typeof(po) != "object"){
return;
}
po.then(function(re){
if(re.canceled !== false || re.filePaths.length < 1){
return;
}
callback(re.filePaths[0]);
},
function(err){
alert(err);
}
);
},
loadingIsClosed: false,

17
public/plugins/export_leanote/plugin.js
View File

@@ -419,7 +419,7 @@ define(function() {
getTargetPath: function(callback) {
// showSaveDialog 不支持property选择文件夹
Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
var po = Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
defaultPath: Api.gui.app.getPath('userDesktop') + '/',
properties: ['openDirectory']
@@ -428,6 +428,21 @@ define(function() {
callback(targetPath);
}
);
if(typeof(po) != "object"){
return;
}
po.then(function(re){
if(re.canceled !== false || re.filePaths.length < 1){
return;
}
callback(re.filePaths[0]);
},
function(err){
alert(err);
}
);
},
loadingIsClosed: false,

22
public/plugins/export_pdf/plugin.js
View File

@@ -152,7 +152,7 @@ define(function() {
getTargetPath: function (callback) {
// showSaveDialog 不支持property选择文件夹
Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
var po = Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
defaultPath: Api.gui.app.getPath('userDesktop') + '/',
properties: ['openDirectory']
@@ -161,6 +161,20 @@ define(function() {
callback(targetPath);
}
);
if(typeof(po) != "object"){
return;
}
po.then(function(re){
if(re.canceled !== false || re.filePaths.length < 1){
return;
}
callback(re.filePaths[0]);
},
function(err){
alert(err);
}
);
},
loadingIsClosed: false,
@@ -185,7 +199,8 @@ define(function() {
setTimeout(function () {
me.hideLoading();
});
}});
}
});
Api.loading.setProgress(1);
Api.noteService.getNotes(notebookId, function (notes) {
@@ -241,7 +256,8 @@ define(function() {
setTimeout(function () {
me.hideLoading();
});
}});
}
});
Api.loading.setProgress(1);
var i = 0;

36
public/plugins/import_evernote/plugin.js
View File

@@ -118,15 +118,7 @@ define(function() {
// 导入, 选择文件
$('#chooseEvernoteFile').click(function() {
Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
properties: ['openFile', 'multiSelections'],
filters: [
{ name: 'Evernote', extensions: ['enex'] }
]
},
function(paths) {
var callback = function(paths) {
if(!paths) {
return;
}
@@ -170,9 +162,33 @@ define(function() {
}
}
);
}
};
var po = Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
properties: ['openFile', 'multiSelections'],
filters: [
{ name: 'Evernote', extensions: ['enex'] }
]
},
callback
);
if(typeof(po) != "object"){
return;
}
po.then(
function(re){
if(re.canceled !== false || re.filePaths.length < 1){
return;
}
callback(re.filePaths);
},
function(err){
alert(err);
}
);
});
},

35
public/plugins/import_html/plugin.js
View File

@@ -118,15 +118,7 @@ define(function() {
// 导入, 选择文件
$('#chooseHTMLFile').click(function() {
Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
properties: ['openFile', 'multiSelections'],
filters: [
{ name: 'HTML', extensions: ['html'] }
]
},
function(paths) {
var callback = function(paths) {
if(!paths) {
return;
}
@@ -170,9 +162,32 @@ define(function() {
}
}
);
};
var po = Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
properties: ['openFile', 'multiSelections'],
filters: [
{ name: 'HTML', extensions: ['html'] }
]
}
, callback
);
if(typeof(po) != "object"){
return;
}
po.then(
function(re){
if(re.canceled !== false || re.filePaths.length < 1){
return;
}
callback(re.filePaths);
},
function(err){
alert(err);
}
);
});
},

31
public/plugins/import_leanote/plugin.js
View File

@@ -118,15 +118,8 @@ define(function() {
// 导入, 选择文件
$('#chooseLeanoteFile').click(function() {
var callback = function(paths) {
Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
properties: ['openFile', 'multiSelections'],
filters: [
{ name: 'Leanote', extensions: ['leanote'] }
]
},
function(paths) {
if(!paths) {
return;
}
@@ -173,8 +166,30 @@ define(function() {
}
);
}
var po = Api.gui.dialog.showOpenDialog(Api.gui.getCurrentWindow(),
{
properties: ['openFile', 'multiSelections'],
filters: [
{ name: 'Leanote', extensions: ['leanote'] }
]
},
callback
);
if(typeof(po) != "object"){
return;
}
po.then(
function(re){
if(re.canceled !== false || re.filePaths.length < 1){
return;
}
callback(re.filePaths);
},
function(err){
alert(err);
}
);
});
},