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

merge dev-life

Browse Source
This commit is contained in:
life
2015-03-31 17:29:16 +08:00
parent bb65ef992a
commit fbf819f4d2
7 changed files with 127 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/tinymce/plugins/paste/plugin.js
View File

@ -630,7 +630,7 @@ define("tinymce/pasteplugin/Clipboard", [
if (html == pasteBinDefaultContent) {
if (!isKeyBoardPaste) {
editor.windowManager.alert('Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents.');
// editor.windowManager.alert('Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents.');
}
return;