diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
index 688af4167..d7c8a76db 100644
--- a/apps/documenteditor/mobile/locale/en.json
+++ b/apps/documenteditor/mobile/locale/en.json
@@ -331,7 +331,8 @@
"textRemoveShape": "Remove Shape",
"textRemoveTable": "Remove Table",
"textRemoveTableContent": "Remove table of contents",
- "textReorder": "Reorder",
+ "del_textReorder": "Reorder",
+ "textArrange": "Arrange",
"textRepeatAsHeaderRow": "Repeat as Header Row",
"textReplace": "Replace",
"textReplaceImage": "Replace Image",
diff --git a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx
index 8b80b1488..3c337e851 100644
--- a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx
+++ b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx
@@ -15,7 +15,7 @@ class AddLinkController extends Component {
closeModal () {
if ( Device.phone ) {
- f7.popup.close('#add-link-popup');
+ f7.popup.close('.add-popup');
} else {
f7.popover.close('#add-link-popover');
}
@@ -59,7 +59,7 @@ class AddLinkController extends Component {
props.put_ToolTip(tip);
api.add_Hyperlink(props);
- this.props.isNavigate ? f7.views.current.router.back() : this.closeModal();
+ this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal();
}
componentDidMount() {
diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx
index adf517762..0930ea82d 100644
--- a/apps/documenteditor/mobile/src/page/main.jsx
+++ b/apps/documenteditor/mobile/src/page/main.jsx
@@ -141,26 +141,35 @@ class MainPage extends Component {
const disabledSettings = storeToolbarSettings.disabledSettings;
const config = appOptions.config;
- let showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo)));
+ let showLogo = !(config.customization && (config.customization.loaderName || config.customization.loaderLogo));
if (!Object.keys(config).length) {
showLogo = !/&(?:logo)=/.test(window.location.search);
}
const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo));
+ const isBranding = appOptions.canBranding || appOptions.canBrandingExt;
+
+ if ($$('.skl-container').length) {
+ $$('.skl-container').remove();
+ }
return (
<Page name="home" className={`editor${showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */}
- <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
- {showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={() => {
- window.open(`${__PUBLISHER_URL__}`, "_blank");
- }}><Icon icon="icon-logo"></Icon></div>}
- <Subnavbar>
- <Toolbar openOptions={this.handleClickToOpenOptions}
- closeOptions={this.handleOptionsViewClosed}/>
- <Search useSuspense={false}/>
- </Subnavbar>
- </Navbar>
+ {config?.customization &&
+ <Navbar id='editor-navbar'
+ className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
+ {(!isBranding && showLogo) &&
+ <div className="main-logo" onClick={() => {
+ window.open(`${__PUBLISHER_URL__}`, "_blank");
+ }}><Icon icon="icon-logo"></Icon></div>}
+ <Subnavbar>
+ <Toolbar openOptions={this.handleClickToOpenOptions}
+ closeOptions={this.handleOptionsViewClosed}/>
+ <Search useSuspense={false}/>
+ </Subnavbar>
+ </Navbar>
+ }
{/* Page content */}
diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx
index 297c8550f..67f0b7350 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx
@@ -456,7 +456,7 @@ const PageReorder = props => {
}
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link sheetClose='#edit-sheet'>
@@ -503,7 +503,7 @@ const EditChart = props => {
onOverlap: props.onOverlap,
onWrapDistance: props.onWrapDistance
}}></ListItem>
- <ListItem title={t('Edit.textReorder')} link='/edit-chart-reorder/' routeProps={{
+ <ListItem title={t('Edit.textArrange')} link='/edit-chart-reorder/' routeProps={{
onReorder: props.onReorder
}}></ListItem>
</List>
diff --git a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx
index bed313844..019156676 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx
@@ -281,7 +281,7 @@ const PageReorder = props => {
}
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link sheetClose='#edit-sheet'>
@@ -330,7 +330,7 @@ const EditImage = props => {
onReplaceByFile: props.onReplaceByFile,
onReplaceByUrl: props.onReplaceByUrl
}}></ListItem>
- { wrapType !== 'inline' && <ListItem title={_t.textReorder} link='/edit-image-reorder/' routeProps={{
+ { wrapType !== 'inline' && <ListItem title={t('Edit.textArrange')} link='/edit-image-reorder/' routeProps={{
onReorder: props.onReorder
}}></ListItem> }
</List>
diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
index ecdc22f06..077dd7143 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
@@ -477,7 +477,7 @@ const PageReorder = props => {
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link sheetClose='#edit-sheet'>
@@ -565,7 +565,7 @@ const EditShape = props => {
onReplace: props.onReplace
}}></ListItem>
}
- {(wrapType !== 'inline' && !isSmartArtInternal && settings.indexOf('image') === -1) && <ListItem title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{
+ {(wrapType !== 'inline' && !isSmartArtInternal && settings.indexOf('image') === -1) && <ListItem title={t('Edit.textArrange')} link='/edit-shape-reorder/' routeProps={{
onReorder: props.onReorder
}}></ListItem> }
</List>
diff --git a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx
index c1c7ac74a..6d1721ae1 100644
--- a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx
+++ b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx
@@ -28,7 +28,7 @@ class AddLinkController extends Component {
closeModal () {
if ( Device.phone ) {
- f7.popup.close('#add-link-popup');
+ f7.popup.close('.add-popup');
} else {
f7.popover.close('#add-link-popover');
}
@@ -112,7 +112,7 @@ class AddLinkController extends Component {
props.put_Text(null);
api.add_Hyperlink(props);
- this.props.isNavigate ? f7.views.current.router.back() : this.closeModal();
+ this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal();
}
getTextDisplay () {
diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx
index d3012f5c7..9df9d4b6a 100644
--- a/apps/presentationeditor/mobile/src/page/main.jsx
+++ b/apps/presentationeditor/mobile/src/page/main.jsx
@@ -13,6 +13,7 @@ import ContextMenu from '../controller/ContextMenu';
import { Toolbar } from "../controller/Toolbar";
import { AddLinkController } from '../controller/add/AddLink';
import { EditLinkController } from '../controller/edit/EditLink';
+
class MainPage extends Component {
constructor(props) {
super(props);
@@ -112,26 +113,32 @@ class MainPage extends Component {
const appOptions = this.props.storeAppOptions;
const config = appOptions.config;
- let showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo)));
+ let showLogo = !(config.customization && (config.customization.loaderName || config.customization.loaderLogo));
if ( !Object.keys(config).length ) {
showLogo = !/&(?:logo)=/.test(window.location.search);
}
const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo));
+ const isBranding = appOptions.canBranding || appOptions.canBrandingExt;
+
return (
<Fragment>
{!this.state.previewVisible ? null : <Preview onclosed={this.handleOptionsViewClosed.bind(this, 'preview')} />}
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */}
- <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
- {showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={() => {
- window.open(`${__PUBLISHER_URL__}`, "_blank");
- }}><Icon icon="icon-logo"></Icon></div>}
- <Subnavbar>
- <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
- <Search useSuspense={false}/>
- </Subnavbar>
- </Navbar>
+ {config?.customization &&
+ <Navbar id='editor-navbar'
+ className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
+ {(!isBranding && showLogo) && <div className="main-logo" onClick={() => {
+ window.open(`${__PUBLISHER_URL__}`, "_blank");
+ }}><Icon icon="icon-logo"></Icon></div>}
+ <Subnavbar>
+ <Toolbar openOptions={this.handleClickToOpenOptions}
+ closeOptions={this.handleOptionsViewClosed}/>
+ <Search useSuspense={false}/>
+ </Subnavbar>
+ </Navbar>
+ }
{/* Page content */}
<View id="editor_sdk" />
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx
index 83d1bb389..a3b620335 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx
@@ -350,7 +350,7 @@ const PageReorder = props => {
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link sheetClose='#edit-sheet'>
@@ -443,7 +443,7 @@ const EditChart = props => {
onBorderColor: props.onBorderColor,
onBorderSize: props.onBorderSize
}}></ListItem>
- <ListItem title={t('View.Edit.textReorder')} link='/edit-chart-reorder/' routeProps={{
+ <ListItem title={t('View.Edit.textArrange')} link='/edit-chart-reorder/' routeProps={{
onReorder: props.onReorder
}}></ListItem>
<ListItem title={t('View.Edit.textAlign')} link="/edit-chart-align/" routeProps={{
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx b/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx
index 5915efdc1..76806b686 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditImage.jsx
@@ -46,7 +46,7 @@ const PageReorder = props => {
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link sheetClose='#edit-sheet'>
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx
index 211abf3c2..72dccc9d2 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx
@@ -358,7 +358,7 @@ const PageReorder = props => {
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link sheetClose='#edit-sheet'>
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
index cb73c5d26..f2e6bd451 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
@@ -393,7 +393,7 @@ const PageReorder = props => {
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link sheetClose='#edit-sheet'>
@@ -524,7 +524,7 @@ const EditTable = props => {
onFillColor: props.onFillColor,
onBorderTypeClick: props.onBorderTypeClick
}}></ListItem>
- <ListItem title={_t.textReorder} link="/edit-table-reorder/" routeProps={{
+ <ListItem title={t('View.Edit.textArrange')} link="/edit-table-reorder/" routeProps={{
onReorder: props.onReorder
}}></ListItem>
<ListItem title={_t.textAlign} link="/edit-table-align/" routeProps={{
diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
index 5caa9d41b..a42b989b4 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
@@ -110,14 +110,13 @@ class AddLinkController extends Component {
}
link.asc_setTooltip(args.tooltip);
-
api.asc_insertHyperlink(link);
- this.props.isNavigate ? f7.views.current.router.back() : this.closeModal();
+ this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal();
}
closeModal () {
if ( Device.phone ) {
- f7.popup.close('#add-link-popup');
+ f7.popup.close('.add-popup');
} else {
f7.popover.close('#add-link-popover');
}
diff --git a/apps/spreadsheeteditor/mobile/src/page/main.jsx b/apps/spreadsheeteditor/mobile/src/page/main.jsx
index a8273ad6f..dc0a82233 100644
--- a/apps/spreadsheeteditor/mobile/src/page/main.jsx
+++ b/apps/spreadsheeteditor/mobile/src/page/main.jsx
@@ -107,12 +107,14 @@ class MainPage extends Component {
const wsLock = storeWorksheets.wsLock;
const config = appOptions.config;
- let showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo)));
+ let showLogo = !(config.customization && (config.customization.loaderName || config.customization.loaderLogo));
if ( !Object.keys(config).length ) {
showLogo = !/&(?:logo)=/.test(window.location.search);
}
const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo));
+ const isBranding = appOptions.canBranding || appOptions.canBrandingExt;
+
if ( $$('.skl-container').length ) {
$$('.skl-container').remove();
}
@@ -120,16 +122,19 @@ class MainPage extends Component {
return (
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */}
- <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
- {showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={
- () => {
- window.open(`${__PUBLISHER_URL__}`, "_blank");
- }}><Icon icon="icon-logo"></Icon></div>}
- <Subnavbar>
- <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
- <Search useSuspense={false}/>
- </Subnavbar>
- </Navbar>
+ {config?.customization &&
+ <Navbar id='editor-navbar'
+ className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
+ {(!isBranding && showLogo) && <div className="main-logo" onClick={() => {
+ window.open(`${__PUBLISHER_URL__}`, "_blank");
+ }}><Icon icon="icon-logo"></Icon></div>}
+ <Subnavbar>
+ <Toolbar openOptions={this.handleClickToOpenOptions}
+ closeOptions={this.handleOptionsViewClosed}/>
+ <Search useSuspense={false}/>
+ </Subnavbar>
+ </Navbar>
+ }
<CellEditor onClickToOpenAddOptions={(panels, button) => this.handleClickToOpenOptions('add', {panels: panels, button: button})}/>
{/* Page content */}
<View id="editor_sdk" />
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx
index ca2bb33ca..0f62152b9 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx
@@ -346,7 +346,7 @@ const PageReorder = props => {
}
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link icon='icon-expand-down' sheetClose></Link>
@@ -1522,7 +1522,7 @@ const EditChart = props => {
disableAxisPos,
needReverse
}}></ListItem>
- <ListItem title={t('View.Edit.textReorder')} link='/edit-chart-reorder/' routeProps={{
+ <ListItem title={t('View.Edit.textArrange')} link='/edit-chart-reorder/' routeProps={{
onReorder: props.onReorder
}}></ListItem>
</List>
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx
index a66d9862c..f749b7113 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx
@@ -42,7 +42,7 @@ const PageReorder = props => {
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link icon='icon-expand-down' sheetClose></Link>
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
index 89acaf088..5a1437dea 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
@@ -334,7 +334,7 @@ const PageReorder = props => {
return (
<Page>
- <Navbar title={_t.textReorder} backLink={_t.textBack}>
+ <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone &&
<NavRight>
<Link icon='icon-expand-down' sheetClose></Link>