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

[PE] Fix Bug 53517

Browse source
This commit is contained in:
ShimaginAndrey 2021-11-15 14:37:24 +03:00
parent 45538869ea
commit d478d44bcd
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/presentationeditor/mobile/src/view/edit/EditText.jsx
View file

@ -241,7 +241,8 @@ const PageFonts = props => {
}; };
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
if (!paragraph && Device.phone) { const shapeObj = props.storeFocusObjects.shapeObject;
if (!shapeObj && !paragraph && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }
@ -325,7 +326,8 @@ const PageFontColor = props => {
}; };
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
if (!paragraph && Device.phone) { const shapeObj = props.storeFocusObjects.shapeObject;
if (!shapeObj && !paragraph && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }
@ -391,6 +393,7 @@ const PageAdditionalFormatting = props => {
const storeTextSettings = props.storeTextSettings; const storeTextSettings = props.storeTextSettings;
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const paragraphObj = storeFocusObjects.paragraphObject; const paragraphObj = storeFocusObjects.paragraphObject;
const shapeObj = storeFocusObjects.shapeObject;
const isSuperscript = storeTextSettings.isSuperscript; const isSuperscript = storeTextSettings.isSuperscript;
const isSubscript = storeTextSettings.isSubscript; const isSubscript = storeTextSettings.isSubscript;
@ -408,7 +411,7 @@ const PageAdditionalFormatting = props => {
letterSpacing = (paragraphObj.get_TextSpacing() === null || paragraphObj.get_TextSpacing() === undefined) ? paragraphObj.get_TextSpacing() : Common.Utils.Metric.fnRecalcFromMM(paragraphObj.get_TextSpacing()); letterSpacing = (paragraphObj.get_TextSpacing() === null || paragraphObj.get_TextSpacing() === undefined) ? paragraphObj.get_TextSpacing() : Common.Utils.Metric.fnRecalcFromMM(paragraphObj.get_TextSpacing());
} }
if (!paragraphObj && Device.phone) { if (!shapeObj && !paragraphObj && Device.phone) {
$$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
return null; return null;
} }