xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paste image

Browse Source
This commit is contained in:
lealife
2015-11-28 17:58:38 +08:00
parent bfa85e2d34
commit 3b3e665a9f
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
public/js/plugins/editor_drop_paste.js
View File

@ -313,9 +313,9 @@ define('editor_drop_paste', ['fileupload'], function() {
// 不知道为什么会触发两次
add: function(e, data) {
// 防止两次
// console.trace(e);
var now = (new Date()).getTime();
if (now - lastTime < 500) {
// console.log('haha');
return;
}
// console.log('nono');
@ -324,16 +324,21 @@ define('editor_drop_paste', ['fileupload'], function() {
var note = Note.getCurNote();
curNote = note;
if(!note || note.IsNew) {
alert("This note hasn't saved, please save it firstly!")
return;
// alert(getMsg("Please save note firstly!"));
// return;
}
// 先显示loading...
editor = tinymce.EditorManager.activeEditor;
if(!note.IsMarkdown) {
var process = new Process(editor);
}
data.process = process;
var jqXHR = data.submit();
// LEA.removePasteBin();
// 为什么要延迟? 为了让paste plugin先执行, 删除掉paste bin
setTimeout(function () {
// 先显示loading...
editor = tinymce.EditorManager.activeEditor;
if(!note.IsMarkdown) {
var process = new Process(editor);
}
data.process = process;
var jqXHR = data.submit();
}, 20);
/*
d.id = '__mcenew' + (new Date()).getTime();