jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
cxt 2015-10-16 10:19:05 +08:00
parent 770f2f14bd ec316e580f
commit fef0475c80
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/assets/kindeditor/pasteimg.js
View File

@ -293,8 +293,8 @@ https://github.com/layerssss/paste.js
}).call(this);
KindEditor.plugin('paste', function(K) {
var editor = this,
function enablePasteImg(_editor) {
var editor = _editor,
name = 'paste';
if(editor.edit == undefined || editor.edit.iframe == undefined){
return;
@ -305,7 +305,7 @@ KindEditor.plugin('paste', function(K) {
var nodeBody = contentWindow.document.getElementsByTagName('body')[0];
console.log(nodeBody);
$(nodeBody).pastableContenteditable();
dataURItoBlob = function(dataURI) {
// convert base64/URLEncoded data component to raw binary data held in a string
var byteString;
@ -351,5 +351,4 @@ KindEditor.plugin('paste', function(K) {
});
return;
});
};