merge dev-life

This commit is contained in:
life committed 2015-03-31 17:29:16 +08:00
1 parent bb65ef992a
commit fbf819f4d2
7 files changed
+127 -22

No files matched your search

@@ -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;