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

Merge branch 'feature/mobile-apps-on-reactjs-pe-edit-settings' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-pe-edit-settings

Browse source
This commit is contained in:
SergeyEzhin 2021-01-29 22:52:52 +03:00
parent f9e91266a5 779dc01aa1
commit 9d2d18575c
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/presentationeditor/mobile/src/store/focusObjects.js
View file

@ -47,7 +47,7 @@ export class storeFocusObjects {
resultArr.splice(resultArr.indexOf('hyperlink'), 1);
}
// Exclude shapes if chart exist
if (resultArr.indexOf('chart') > -1) {
if (resultArr.indexOf('chart') > -1 && resultArr.indexOf('shape') > -1) {
resultArr.splice(resultArr.indexOf('shape'), 1);
}
return resultArr;
@ -149,28 +149,19 @@ export class storeFocusObjects {
@computed get chartObject() {
const charts = [];
const shapes = []
for (let object of this._focusObjects) {
if (object.get_ObjectValue() == Asc.c_oAscTypeSelectElement.Chart) {
if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Chart) {
charts.push(object);
}
else if(object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Shape && object.get_ObjectValue() && object.get_ObjectValue().get_FromChart()) {
shapes.push(object)
}
}
const getTopObject = array => {
if (array.length > 0) {
var object = array[array.length - 1]; // get top
return object.get_ObjectValue();
} else {
return undefined;
}
};
getTopObject(charts);
getTopObject(shapes);
if (charts.length > 0) {
const object = charts[charts.length - 1]; // get top
return object.get_ObjectValue();
} else {
return undefined;
}
}
@computed get linkObject() {