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/classes/Clipboard.js
View File

@ -445,7 +445,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;

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

@ -117,4 +117,4 @@
writeScripts();
})(this);
// $hash: eead586884e827fb28480c335ab9d3fc
// $hash: f3a0fcfa29bc6add5936abc6d2d3ac05

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;

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

File diff suppressed because one or more lines are too long