Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

public/assets/kindeditor/pasteimg.js

@@ -293,8 +293,8 @@ https://github.com/layerssss/paste.js
 
 }).call(this);
 
-KindEditor.plugin('paste', function(K) {
+function enablePasteImg(_editor) {
-    var editor = this,
+    var editor = _editor,
         name = 'paste';
     if(editor.edit == undefined || editor.edit.iframe == undefined){
         return;
@@ -351,5 +351,4 @@ KindEditor.plugin('paste', function(K) {
 
     });
     return;
-    
+};
-});