espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-05-24 16:47:47 +03:00
parent 27105910df bd2204156e
commit c74111e29b
3 changed files with 37 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/fields/wysiwyg.js
+35 -75
View File
@@ -446,43 +446,20 @@ define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], function
keyMap: keyMap,
callbacks: {
onImageUpload: (files) => {
var file = files[0];
let file = files[0];
this.notify('Uploading...');
Espo.Ui.notify(this.translate('Uploading...'));
this.getModelFactory().create('Attachment', (attachment) => {
var fileReader = new FileReader();
this.uploadInlineAttachment(file)
.then(attachment => {
let url = '?entryPoint=attachment&id=' + attachment.id;
this.$summernote.summernote('insertImage', url);
fileReader.onload = (e) => {
attachment.set('name', file.name);
attachment.set('type', file.type);
attachment.set('role', 'Inline Attachment');
attachment.set('global', true);
attachment.set('size', file.size);
if (this.model.id) {
attachment.set('relatedId', this.model.id);
}
attachment.set('relatedType', this.model.name);
attachment.set('file', e.target.result);
attachment.set('field', this.name);
attachment.once('sync', () => {
var url = '?entryPoint=attachment&id=' + attachment.id;
this.$summernote.summernote('insertImage', url);
this.notify(false);
});
attachment.save();
};
fileReader.readAsDataURL(file);
});
Espo.Ui.notify(false);
});
},
onBlur: () => {
this.trigger('change')
this.trigger('change');
},
},
onCreateLink: function (link) {
@@ -523,55 +500,36 @@ define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], function
this.$toolbar = this.$el.find('.note-toolbar');
this.$area = this.$el.find('.note-editing-area');
},
this.$area.on('paste', (e) => {
var items = e.originalEvent.clipboardData.items;
uploadInlineAttachment: function (file) {
return new Promise((resolve, reject) => {
this.getModelFactory().create('Attachment', attachment => {
let fileReader = new FileReader();
if (items) {
for (var i = 0; i < items.length; i++) {
if (!~items[i].type.indexOf('image')) {
continue;
fileReader.onload = (e) => {
attachment.set('name', file.name);
attachment.set('type', file.type);
attachment.set('role', 'Inline Attachment');
attachment.set('global', true);
attachment.set('size', file.size);
if (this.model.id) {
attachment.set('relatedId', this.model.id);
}
let file = items[i].getAsFile();
attachment.set('relatedType', this.model.name);
attachment.set('file', e.target.result);
attachment.set('field', this.name);
e.preventDefault();
e.stopPropagation();
attachment
.save()
.then(() => resolve(attachment))
.catch(() => reject());
};
let fileReader = new FileReader();
fileReader.onload = e => {
this.getModelFactory().create('Attachment', attachment => {
attachment.set('name', file.name);
attachment.set('type', file.type);
attachment.set('role', 'Inline Attachment');
attachment.set('global', true);
attachment.set('size', file.size);
if (this.model.id) {
attachment.set('relatedId', this.model.id);
}
attachment.set('relatedType', this.model.name);
attachment.set('file', e.target.result);
attachment.set('field', this.name);
attachment
.save()
.then(() => {
let url = '?entryPoint=attachment&id=' + attachment.id;
this.$summernote.summernote('insertImage', url);
this.notify(false);
});
});
};
fileReader.readAsDataURL(file);
}
}
fileReader.readAsDataURL(file);
});
});
},
@@ -979,11 +937,13 @@ define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], function
this.$window.off('resize.summernote' + self.cid);
this.resizeTo({ h: this.$editable.data('orgHeight') });
this.$editable.css('maxHeight', this.$editable.css('orgMaxHeight'));
if (this.isInModal) {
this.$modal.css('overflow-y', '');
} else {
this.$scrollbar.css('overflow', '');
}
this._isFullscreen = false;
}
package-lock.json
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "7.1.6",
"version": "7.1.7",
"lockfileVersion": 2,
"requires": true,
"packages": {
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "7.1.6",
"version": "7.1.7",
"description": "Open-source CRM.",
"repository": {
"type": "git",