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

Preview image before paste

Browse Source 
Closes #835
This commit is contained in:
Igor Zhukov 2016-02-08 18:27:09 +00:00
parent ff6525da35
commit 65e35adc4c
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/js/directives.js
View File

@ -1430,7 +1430,7 @@ angular.module('myApp.directives', ['myApp.filters'])
}) })
.directive('mySendForm', function (_, $timeout, $compile, $modalStack, $http, $interpolate, Storage, AppStickersManager, AppDocsManager, ErrorService, AppInlineBotsManager, shouldFocusOnInteraction) { .directive('mySendForm', function (_, $q, $timeout, $compile, $modalStack, $http, $interpolate, Storage, AppStickersManager, AppDocsManager, ErrorService, AppInlineBotsManager, FileManager, shouldFocusOnInteraction) {
return { return {
link: link, link: link,
scope: { scope: {
@ -1685,10 +1685,18 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
function onFilePaste (blob) { function onFilePaste (blob) {
ErrorService.confirm({type: 'FILE_CLIPBOARD_PASTE'}).then(function () { var mimeType = blob.type || '';
var fileUrlPromise = $q.when(false);
if (['image/jpeg', 'image/gif', 'image/png', 'image/bmp'].indexOf(mimeType) >= 0) {
fileUrlPromise = FileManager.getFileCorrectUrl(blob, mimeType);
}
fileUrlPromise.then(function (fileUrl) {
fileUrl = fileUrl || false;
ErrorService.confirm({type: 'FILE_CLIPBOARD_PASTE', fileUrl: fileUrl}).then(function () {
$scope.draftMessage.files = [blob]; $scope.draftMessage.files = [blob];
$scope.draftMessage.isMedia = true; $scope.draftMessage.isMedia = true;
}); });
})
}; };
function onPasteEvent (e) { function onPasteEvent (e) {
@ -1705,6 +1713,9 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
if (files.length > 0) { if (files.length > 0) {
if (files.length == 1) {
return onFilePaste(files[0]);
}
ErrorService.confirm({type: 'FILES_CLIPBOARD_PASTE', files: files}).then(function () { ErrorService.confirm({type: 'FILES_CLIPBOARD_PASTE', files: files}).then(function () {
$scope.draftMessage.files = files; $scope.draftMessage.files = files;
$scope.draftMessage.isMedia = true; $scope.draftMessage.isMedia = true;

8
app/less/app.less
View File

@ -3301,6 +3301,14 @@ _:-ms-lang(x), .composer_rich_textarea:empty:focus:before {
.confirm_modal_extlink_jump { .confirm_modal_extlink_jump {
word-break: break-all; word-break: break-all;
} }
.confirm_modal_paste_image {
max-width: 274px;
height: 274px;
background-position: 50% 50%;
background-size: cover;
background-repeat: no-repeat;
margin: 10px auto -10px;
}
.photo_modal_window, .photo_modal_window,
.video_modal_window, .video_modal_window,

5
app/partials/desktop/confirm_modal.html
View File

@ -14,7 +14,10 @@
when="confirm_modal_clipboard_X_files_send"> when="confirm_modal_clipboard_X_files_send">
</ng-pluralize> </ng-pluralize>
</span> </span>
<span ng-switch-when="FILE_CLIPBOARD_PASTE" my-i18n="confirm_modal_clipboard_file_send"></span> <div ng-switch-when="FILE_CLIPBOARD_PASTE">
<span my-i18n="confirm_modal_clipboard_file_send"></span>
<div class="confirm_modal_paste_image" ng-if="fileUrl !== false" ng-style="{backgroundImage: 'url(' + fileUrl + ')'}"></div>
</div>
<span ng-switch-when="MESSAGE_DELETE" my-i18n="confirm_modal_message_delete"></span> <span ng-switch-when="MESSAGE_DELETE" my-i18n="confirm_modal_message_delete"></span>
<span ng-switch-when="MESSAGES_DELETE"> <span ng-switch-when="MESSAGES_DELETE">
<ng-pluralize count="count" <ng-pluralize count="count"