Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix loading images from storage

Browse source
This commit is contained in:
Julia Radzhabova 2021-08-27 14:07:50 +03:00
parent 9df3f537c8
commit 7b57bdb6b7
12 changed files with 45 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -1618,8 +1618,15 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && (data.url || data.images) && (!data.c || data.c=='add')) { if (data && data._urls && (!data.c || data.c=='add')) {
this.toolbar.fireEvent('insertimage', this.toolbar); this.toolbar.fireEvent('insertimage', this.toolbar);
(data._urls.length>0) && this.api.AddImageUrl(data._urls, undefined, data.token);// for loading from storage
Common.component.Analytics.trackEvent('ToolBar', 'Image');
}
},
insertImage: function(data) { // gateway
if (data && (data.url || data.images)) {
var arr = []; var arr = [];
if (data.images && data.images.length>0) { if (data.images && data.images.length>0) {
for (var i=0; i<data.images.length; i++) { for (var i=0; i<data.images.length; i++) {
@ -1627,12 +1634,8 @@ define([
} }
} else } else
data.url && arr.push(data.url); data.url && arr.push(data.url);
(arr.length>0) && this.api.AddImageUrl(arr, undefined, data.token);// for loading from storage data._urls = arr;
Common.component.Analytics.trackEvent('ToolBar', 'Image');
} }
},
insertImage: function(data) { // gateway
Common.NotificationCenter.trigger('storage:image-insert', data); Common.NotificationCenter.trigger('storage:image-insert', data);
}, },

4
apps/documenteditor/main/app/view/FormSettings.js
View file

@ -711,8 +711,8 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && data.url && data.c=='control') { if (data && data._urls && data.c=='control') {
this.setImageUrl(data.url, data.token); this.setImageUrl(data._urls[0], data.token);
} }
}, },

4
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -495,8 +495,8 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && data.url && data.c=='change') { if (data && data._urls && data.c=='change') {
this.setImageUrl(data.url, data.token); this.setImageUrl(data._urls[0], data.token);
} }
}, },

4
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -719,8 +719,8 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && data.url && data.c=='fill') { if (data && data._urls && data.c=='fill') {
this.setImageUrl(data.url, data.token); this.setImageUrl(data._urls[0], data.token);
} }
}, },

4
apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
View file

@ -411,8 +411,8 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
this.api.asc_registerCallback('asc_onWatermarkImageLoaded', onApiWMLoaded); this.api.asc_registerCallback('asc_onWatermarkImageLoaded', onApiWMLoaded);
var insertImageFromStorage = function(data) { var insertImageFromStorage = function(data) {
if (data && data.url && data.c=='watermark') { if (data && data._urls && data.c=='watermark') {
me.props.put_ImageUrl(data.url, data.token); me.props.put_ImageUrl(data._urls[0], data.token);
} }
}; };
Common.NotificationCenter.on('storage:image-insert', insertImageFromStorage); Common.NotificationCenter.on('storage:image-insert', insertImageFromStorage);

15
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -1618,8 +1618,15 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && (data.url || data.images) && (!data.c || data.c=='add')) { if (data && data._urls && (!data.c || data.c=='add')) {
this.toolbar.fireEvent('insertimage', this.toolbar); this.toolbar.fireEvent('insertimage', this.toolbar);
(data._urls.length>0) && this.api.AddImageUrl(data._urls, undefined, data.token);// for loading from storage
Common.component.Analytics.trackEvent('ToolBar', 'Image');
}
},
insertImage: function(data) { // gateway
if (data && (data.url || data.images)) {
var arr = []; var arr = [];
if (data.images && data.images.length>0) { if (data.images && data.images.length>0) {
for (var i=0; i<data.images.length; i++) { for (var i=0; i<data.images.length; i++) {
@ -1627,12 +1634,8 @@ define([
} }
} else } else
data.url && arr.push(data.url); data.url && arr.push(data.url);
(arr.length>0) && this.api.AddImageUrl(arr, undefined, data.token);// for loading from storage data._urls = arr;
Common.component.Analytics.trackEvent('ToolBar', 'Image');
} }
},
insertImage: function(data) { // gateway
Common.NotificationCenter.trigger('storage:image-insert', data); Common.NotificationCenter.trigger('storage:image-insert', data);
}, },

4
apps/presentationeditor/main/app/view/ImageSettings.js
View file

@ -331,8 +331,8 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && data.url && data.c=='change') { if (data && data._urls && data.c=='change') {
this.setImageUrl(data.url, data.token); this.setImageUrl(data._urls[0], data.token);
} }
}, },

4
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -659,8 +659,8 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && data.url && data.c=='fill') { if (data && data._urls && data.c=='fill') {
this.setImageUrl(data.url, data.token); this.setImageUrl(data._urls[0], data.token);
} }
}, },

4
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -639,8 +639,8 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && data.url && data.c=='slide') { if (data && data._urls && data.c=='slide') {
this.setImageUrl(data.url, data.token); this.setImageUrl(data._urls[0], data.token);
} }
}, },

15
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -899,8 +899,15 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && (data.url || data.images) && (!data.c || data.c=='add')) { if (data && data._urls && (!data.c || data.c=='add')) {
this.toolbar.fireEvent('insertimage', this.toolbar); this.toolbar.fireEvent('insertimage', this.toolbar);
(data._urls.length>0) && this.api.asc_addImageDrawingObject(data._urls, undefined, data.token);// for loading from storage
Common.component.Analytics.trackEvent('ToolBar', 'Image');
}
},
insertImage: function(data) { // gateway
if (data && (data.url || data.images)) {
var arr = []; var arr = [];
if (data.images && data.images.length>0) { if (data.images && data.images.length>0) {
for (var i=0; i<data.images.length; i++) { for (var i=0; i<data.images.length; i++) {
@ -908,12 +915,8 @@ define([
} }
} else } else
data.url && arr.push(data.url); data.url && arr.push(data.url);
(arr.length>0) && this.api.asc_addImageDrawingObject(arr, undefined, data.token);// for loading from storage data._urls = arr;
Common.component.Analytics.trackEvent('ToolBar', 'Image');
} }
},
insertImage: function(data) { // gateway
Common.NotificationCenter.trigger('storage:image-insert', data); Common.NotificationCenter.trigger('storage:image-insert', data);
}, },

4
apps/spreadsheeteditor/main/app/view/ImageSettings.js
View file

@ -468,8 +468,8 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && data.url && data.c=='change') { if (data && data._urls && data.c=='change') {
this.setImageUrl(data.url, data.token); this.setImageUrl(data._urls[0], data.token);
} }
}, },

4
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -679,8 +679,8 @@ define([
}, },
insertImageFromStorage: function(data) { insertImageFromStorage: function(data) {
if (data && data.url && data.c=='fill') { if (data && data._urls && data.c=='fill') {
this.setImageUrl(data.url, data.token); this.setImageUrl(data._urls[0], data.token);
} }
}, },