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

ipc new api, loadURL, image.toDataURL

Browse Source
This commit is contained in:
life
2016-05-22 15:15:27 +08:00
parent 15c2f75be9
commit faa9f8b308
6 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/js/common.js
View File

@@ -449,7 +449,7 @@ const {clipboard} = require('electron');
function pasteImage(e) {
var image = clipboard.readImage();
if(image) {
var dataUrl = image.toDataUrl();
var dataUrl = image.toDataURL();
// 空图片
if(dataUrl == "data:image/png;base64,") {
return;
@@ -1499,19 +1499,19 @@ var ContextTips = {
};
function goToMainPage() {
var BrowserWindow = gui.remote.require('browser-window');
var BrowserWindow = gui.remote.BrowserWindow;
var win = new BrowserWindow(getMainWinParams());
win.loadUrl('file://' + __dirname + '/note.html?from=login');
win.loadURL('file://' + __dirname + '/note.html?from=login');
}
function toLogin() {
var BrowserWindow = gui.remote.require('browser-window');
var BrowserWindow = gui.remote.BrowserWindow;
if(isMac()) {
var win = new BrowserWindow({ width: 278, height: 326, show: true, frame: false, resizable: false });
win.loadUrl('file://' + __dirname + '/login.html');
win.loadURL('file://' + __dirname + '/login.html');
} else {
var win = new BrowserWindow({ width: 278, height: 400, show: true, frame: true, resizable: false });
win.loadUrl('file://' + __dirname + '/login.html');
win.loadURL('file://' + __dirname + '/login.html');
}
gui.getCurrentWindow().close();
}