r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed file paste in IE

Browse Source
This commit is contained in:
Igor Zhukov 2015-02-13 15:16:03 +03:00
parent a87ae20055
commit 9830340ef8
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/js/directives.js
View File

@ -1119,7 +1119,7 @@ angular.module('myApp.directives', ['myApp.filters'])
return sendOnEnter; return sendOnEnter;
}, },
onMessageSubmit: onMessageSubmit, onMessageSubmit: onMessageSubmit,
onFilesPaste: onFilesPaste onFilePaste: onFilePaste
}); });
var richTextarea = composer.richTextareaEl[0]; var richTextarea = composer.richTextareaEl[0];
@ -1223,9 +1223,9 @@ angular.module('myApp.directives', ['myApp.filters'])
}); });
} }
function onFilesPaste (blobs) { function onFilePaste (blob) {
ErrorService.confirm({type: 'FILE_CLIPBOARD_PASTE'}).then(function () { ErrorService.confirm({type: 'FILE_CLIPBOARD_PASTE'}).then(function () {
$scope.draftMessage.files = blobs; $scope.draftMessage.files = [blob];
$scope.draftMessage.isMedia = true; $scope.draftMessage.isMedia = true;
}); });
}; };

9
app/js/message_composer.js
View File

@ -438,6 +438,7 @@ function MessageComposer (textarea, options) {
this.onTyping = options.onTyping; this.onTyping = options.onTyping;
this.onMessageSubmit = options.onMessageSubmit; this.onMessageSubmit = options.onMessageSubmit;
this.getSendOnEnter = options.getSendOnEnter; this.getSendOnEnter = options.getSendOnEnter;
this.onFilePaste = options.onFilePaste;
} }
MessageComposer.prototype.setUpInput = function () { MessageComposer.prototype.setUpInput = function () {
@ -673,7 +674,11 @@ MessageComposer.prototype.onRichPaste = function (e) {
} }
} }
var text = (e.originalEvent || e).clipboardData.getData('text/plain'); try {
var text = cData.getData('text/plain');
} catch (e) {
return true;
}
setZeroTimeout(this.onChange.bind(this), 0); setZeroTimeout(this.onChange.bind(this), 0);
if (text.length) { if (text.length) {
document.execCommand('insertText', false, text); document.execCommand('insertText', false, text);
@ -692,7 +697,7 @@ MessageComposer.prototype.onRichPasteNode = function (e) {
var blob = dataUrlToBlob(src); var blob = dataUrlToBlob(src);
this.onFilePaste(blob); this.onFilePaste(blob);
setZeroTimeout(function () { setZeroTimeout(function () {
element.parentNode.removeChild(element); element.parentNode.replaceChild(document.createTextNode('   '), element);
}) })
} }
else if (src && !src.match(/img\/blank\.gif/)) { else if (src && !src.match(/img\/blank\.gif/)) {

2
app/js/services.js
View File

@ -3710,7 +3710,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
// console.log(3, text, html); // console.log(3, text, html);
if (emojiFound) { if (emojiFound) {
text = text.replace(/\ufe0f/g, '', text); text = text.replace(/\ufe0f|️/g, '', text);
text = text.replace(/<span class="emoji emoji-(\d)-(\d+)-(\d+)"(.+?)<\/span>/g, text = text.replace(/<span class="emoji emoji-(\d)-(\d+)-(\d+)"(.+?)<\/span>/g,
'<span class="emoji emoji-spritesheet-$1" style="background-position: -$2px -$3px;" $4</span>'); '<span class="emoji emoji-spritesheet-$1" style="background-position: -$2px -$3px;" $4</span>');
} }