diff --git a/public/js/app/page.js b/public/js/app/page.js index 09e15adb..d9b07f2b 100644 --- a/public/js/app/page.js +++ b/public/js/app/page.js @@ -826,6 +826,11 @@ $(function() { e.preventDefault(); return false; }); + + // markdown编辑器paste + $('#wmd-input-sub').on('paste', function(e) { + pasteImage(e); + }); }); diff --git a/public/js/app/service.js b/public/js/app/service.js index e320f7a1..d41224d4 100644 --- a/public/js/app/service.js +++ b/public/js/app/service.js @@ -79,10 +79,10 @@ $(function() { // bind close event // 保存当前打开的笔记 -// win.on('close', function() { +win.on('close', function() { // TODO - // win.close(true); -// }); + win.close(true); +}); function isURL(str_url){ var re = new RegExp("^((https|http|ftp|rtsp|mms)://).+"); @@ -109,8 +109,9 @@ $('#noteTitle, #searchNoteInput, #searchNotebookForList, #addTagInput, #wmd-inpu menu.canOpenInBroswer(!!winHref); var selectionType = window.getSelection().type.toUpperCase(); - var clipData = gui.Clipboard.get().get(); - menu.canPaste(clipData.length > 0); + // var clipData = gui.Clipboard.get().get(); + // menu.canPaste(clipData.length > 0); + menu.canPaste(true); menu.canCopy(selectionType === 'RANGE'); menu.popup(e.originalEvent.x, e.originalEvent.y); }); diff --git a/public/js/common.js b/public/js/common.js index 549d4b49..82f76b34 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -441,10 +441,10 @@ function pasteImage(e) { } // 插入图片(链接) -// TODO Markdown 插入图片 +// Markdown 插入图片 function insertImage(link) { if(LEA.isMarkdownEditor()) { - MD.insertLink(link); + MD.insertLink(link, '', true); } else { tinymce.activeEditor.insertContent(''); }