mirror of
https://github.com/leanote/desktop-app.git
synced 2025-10-15 15:41:19 +00:00
linux下粘贴, 多次. 原因:pasteImage会触发paste事件, 导致多次复制
https://github.com/leanote/desktop-app/issues/56
This commit is contained in:
@@ -435,6 +435,7 @@ function pasteImage(e) {
|
||||
FileService.pasteImage2(dataUrl, function(url) {
|
||||
insertImage(url);
|
||||
});
|
||||
e && e.preventDefault();
|
||||
}
|
||||
return;
|
||||
|
||||
@@ -1481,7 +1482,7 @@ function switchAccount() {
|
||||
var win = new BrowserWindow({ width: 278, height: 326, show: true, frame: false, resizable: false });
|
||||
win.loadUrl('file://' + __dirname + '/login.html');
|
||||
} else {
|
||||
var win = new BrowserWindow({ width: 278, height: 426, show: true, frame: true, resizable: false });
|
||||
var win = new BrowserWindow({ width: 278, height: 400, show: true, frame: true, resizable: false });
|
||||
win.loadUrl('file://' + __dirname + '/login.html');
|
||||
}
|
||||
gui.getCurrentWindow().close();
|
||||
|
@@ -523,11 +523,23 @@ define("tinymce/pasteplugin/Clipboard", [
|
||||
document.body.appendChild(img);
|
||||
}
|
||||
|
||||
var ever;
|
||||
editor.on('paste', function(e) {
|
||||
if(inAcePrevent()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// start
|
||||
// 以下只是linux需要
|
||||
// -----
|
||||
// 为什么要这个, 因为linux的原因, pasteImage会触发paste事件, 导致多次复制
|
||||
if (ever && new Date().getTime() - ever < 100) {
|
||||
e.preventDefault();
|
||||
return;
|
||||
}
|
||||
ever = new Date().getTime();
|
||||
// end
|
||||
|
||||
var clipboardContent = getClipboardContent(e);
|
||||
var isKeyBoardPaste = new Date().getTime() - keyboardPasteTimeStamp < 100;
|
||||
var plainTextMode = self.pasteFormat == "text" || keyboardPastePlainTextState;
|
||||
@@ -583,7 +595,7 @@ define("tinymce/pasteplugin/Clipboard", [
|
||||
// paste image
|
||||
try {
|
||||
// common.js
|
||||
pasteImage();
|
||||
pasteImage(e);
|
||||
return;
|
||||
/*
|
||||
if(pasteImage(e)) {
|
||||
|
Reference in New Issue
Block a user