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

Merge pull request #2073 from ONLYOFFICE/feature/fix-bugs

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-11-21 16:37:43 +03:00 committed by GitHub
parent bcfbc4cd0c 1ba98170e6
commit 4f4e1fb5db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 77 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/documenteditor/mobile/locale/en.json
View file

@ -331,7 +331,8 @@
"textRemoveShape": "Remove Shape", "textRemoveShape": "Remove Shape",
"textRemoveTable": "Remove Table", "textRemoveTable": "Remove Table",
"textRemoveTableContent": "Remove table of contents", "textRemoveTableContent": "Remove table of contents",
"textReorder": "Reorder", "del_textReorder": "Reorder",
"textArrange": "Arrange",
"textRepeatAsHeaderRow": "Repeat as Header Row", "textRepeatAsHeaderRow": "Repeat as Header Row",
"textReplace": "Replace", "textReplace": "Replace",
"textReplaceImage": "Replace Image", "textReplaceImage": "Replace Image",

4
apps/documenteditor/mobile/src/controller/add/AddLink.jsx
View file

@ -15,7 +15,7 @@ class AddLinkController extends Component {
closeModal () { closeModal () {
if ( Device.phone ) { if ( Device.phone ) {
f7.popup.close('#add-link-popup'); f7.popup.close('.add-popup');
} else { } else {
f7.popover.close('#add-link-popover'); f7.popover.close('#add-link-popover');
} }
@ -59,7 +59,7 @@ class AddLinkController extends Component {
props.put_ToolTip(tip); props.put_ToolTip(tip);
api.add_Hyperlink(props); 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() { componentDidMount() {

31
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -141,26 +141,35 @@ class MainPage extends Component {
const disabledSettings = storeToolbarSettings.disabledSettings; const disabledSettings = storeToolbarSettings.disabledSettings;
const config = appOptions.config; 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) { if (!Object.keys(config).length) {
showLogo = !/&(?:logo)=/.test(window.location.search); showLogo = !/&(?:logo)=/.test(window.location.search);
} }
const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo)); 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 ( return (
<Page name="home" className={`editor${showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */} {/* Top Navbar */}
<Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}> {config?.customization &&
{showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={() => { <Navbar id='editor-navbar'
window.open(`${__PUBLISHER_URL__}`, "_blank"); className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
}}><Icon icon="icon-logo"></Icon></div>} {(!isBranding && showLogo) &&
<Subnavbar> <div className="main-logo" onClick={() => {
<Toolbar openOptions={this.handleClickToOpenOptions} window.open(`${__PUBLISHER_URL__}`, "_blank");
closeOptions={this.handleOptionsViewClosed}/> }}><Icon icon="icon-logo"></Icon></div>}
<Search useSuspense={false}/> <Subnavbar>
</Subnavbar> <Toolbar openOptions={this.handleClickToOpenOptions}
</Navbar> closeOptions={this.handleOptionsViewClosed}/>
<Search useSuspense={false}/>
</Subnavbar>
</Navbar>
}
{/* Page content */} {/* Page content */}

4
apps/documenteditor/mobile/src/view/edit/EditChart.jsx
View file

@ -456,7 +456,7 @@ const PageReorder = props => {
} }
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link sheetClose='#edit-sheet'> <Link sheetClose='#edit-sheet'>
@ -503,7 +503,7 @@ const EditChart = props => {
onOverlap: props.onOverlap, onOverlap: props.onOverlap,
onWrapDistance: props.onWrapDistance onWrapDistance: props.onWrapDistance
}}></ListItem> }}></ListItem>
<ListItem title={t('Edit.textReorder')} link='/edit-chart-reorder/' routeProps={{ <ListItem title={t('Edit.textArrange')} link='/edit-chart-reorder/' routeProps={{
onReorder: props.onReorder onReorder: props.onReorder
}}></ListItem> }}></ListItem>
</List> </List>

4
apps/documenteditor/mobile/src/view/edit/EditImage.jsx
View file

@ -281,7 +281,7 @@ const PageReorder = props => {
} }
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link sheetClose='#edit-sheet'> <Link sheetClose='#edit-sheet'>
@ -330,7 +330,7 @@ const EditImage = props => {
onReplaceByFile: props.onReplaceByFile, onReplaceByFile: props.onReplaceByFile,
onReplaceByUrl: props.onReplaceByUrl onReplaceByUrl: props.onReplaceByUrl
}}></ListItem> }}></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 onReorder: props.onReorder
}}></ListItem> } }}></ListItem> }
</List> </List>

4
apps/documenteditor/mobile/src/view/edit/EditShape.jsx
View file

@ -477,7 +477,7 @@ const PageReorder = props => {
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link sheetClose='#edit-sheet'> <Link sheetClose='#edit-sheet'>
@ -565,7 +565,7 @@ const EditShape = props => {
onReplace: props.onReplace onReplace: props.onReplace
}}></ListItem> }}></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 onReorder: props.onReorder
}}></ListItem> } }}></ListItem> }
</List> </List>

4
apps/presentationeditor/mobile/src/controller/add/AddLink.jsx
View file

@ -28,7 +28,7 @@ class AddLinkController extends Component {
closeModal () { closeModal () {
if ( Device.phone ) { if ( Device.phone ) {
f7.popup.close('#add-link-popup'); f7.popup.close('.add-popup');
} else { } else {
f7.popover.close('#add-link-popover'); f7.popover.close('#add-link-popover');
} }
@ -112,7 +112,7 @@ class AddLinkController extends Component {
props.put_Text(null); props.put_Text(null);
api.add_Hyperlink(props); 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 () { getTextDisplay () {

27
apps/presentationeditor/mobile/src/page/main.jsx
View file

@ -13,6 +13,7 @@ import ContextMenu from '../controller/ContextMenu';
import { Toolbar } from "../controller/Toolbar"; import { Toolbar } from "../controller/Toolbar";
import { AddLinkController } from '../controller/add/AddLink'; import { AddLinkController } from '../controller/add/AddLink';
import { EditLinkController } from '../controller/edit/EditLink'; import { EditLinkController } from '../controller/edit/EditLink';
class MainPage extends Component { class MainPage extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
@ -112,26 +113,32 @@ class MainPage extends Component {
const appOptions = this.props.storeAppOptions; const appOptions = this.props.storeAppOptions;
const config = appOptions.config; 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 ) { if ( !Object.keys(config).length ) {
showLogo = !/&(?:logo)=/.test(window.location.search); showLogo = !/&(?:logo)=/.test(window.location.search);
} }
const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo)); const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo));
const isBranding = appOptions.canBranding || appOptions.canBrandingExt;
return ( return (
<Fragment> <Fragment>
{!this.state.previewVisible ? null : <Preview onclosed={this.handleOptionsViewClosed.bind(this, 'preview')} />} {!this.state.previewVisible ? null : <Preview onclosed={this.handleOptionsViewClosed.bind(this, 'preview')} />}
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */} {/* Top Navbar */}
<Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}> {config?.customization &&
{showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={() => { <Navbar id='editor-navbar'
window.open(`${__PUBLISHER_URL__}`, "_blank"); className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
}}><Icon icon="icon-logo"></Icon></div>} {(!isBranding && showLogo) && <div className="main-logo" onClick={() => {
<Subnavbar> window.open(`${__PUBLISHER_URL__}`, "_blank");
<Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/> }}><Icon icon="icon-logo"></Icon></div>}
<Search useSuspense={false}/> <Subnavbar>
</Subnavbar> <Toolbar openOptions={this.handleClickToOpenOptions}
</Navbar> closeOptions={this.handleOptionsViewClosed}/>
<Search useSuspense={false}/>
</Subnavbar>
</Navbar>
}
{/* Page content */} {/* Page content */}
<View id="editor_sdk" /> <View id="editor_sdk" />

4
apps/presentationeditor/mobile/src/view/edit/EditChart.jsx
View file

@ -350,7 +350,7 @@ const PageReorder = props => {
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link sheetClose='#edit-sheet'> <Link sheetClose='#edit-sheet'>
@ -443,7 +443,7 @@ const EditChart = props => {
onBorderColor: props.onBorderColor, onBorderColor: props.onBorderColor,
onBorderSize: props.onBorderSize onBorderSize: props.onBorderSize
}}></ListItem> }}></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 onReorder: props.onReorder
}}></ListItem> }}></ListItem>
<ListItem title={t('View.Edit.textAlign')} link="/edit-chart-align/" routeProps={{ <ListItem title={t('View.Edit.textAlign')} link="/edit-chart-align/" routeProps={{

2
apps/presentationeditor/mobile/src/view/edit/EditImage.jsx
View file

@ -46,7 +46,7 @@ const PageReorder = props => {
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link sheetClose='#edit-sheet'> <Link sheetClose='#edit-sheet'>

2
apps/presentationeditor/mobile/src/view/edit/EditShape.jsx
View file

@ -358,7 +358,7 @@ const PageReorder = props => {
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link sheetClose='#edit-sheet'> <Link sheetClose='#edit-sheet'>

4
apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
View file

@ -393,7 +393,7 @@ const PageReorder = props => {
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link sheetClose='#edit-sheet'> <Link sheetClose='#edit-sheet'>
@ -524,7 +524,7 @@ const EditTable = props => {
onFillColor: props.onFillColor, onFillColor: props.onFillColor,
onBorderTypeClick: props.onBorderTypeClick onBorderTypeClick: props.onBorderTypeClick
}}></ListItem> }}></ListItem>
<ListItem title={_t.textReorder} link="/edit-table-reorder/" routeProps={{ <ListItem title={t('View.Edit.textArrange')} link="/edit-table-reorder/" routeProps={{
onReorder: props.onReorder onReorder: props.onReorder
}}></ListItem> }}></ListItem>
<ListItem title={_t.textAlign} link="/edit-table-align/" routeProps={{ <ListItem title={_t.textAlign} link="/edit-table-align/" routeProps={{

5
apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
View file

@ -110,14 +110,13 @@ class AddLinkController extends Component {
} }
link.asc_setTooltip(args.tooltip); link.asc_setTooltip(args.tooltip);
api.asc_insertHyperlink(link); 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 () { closeModal () {
if ( Device.phone ) { if ( Device.phone ) {
f7.popup.close('#add-link-popup'); f7.popup.close('.add-popup');
} else { } else {
f7.popover.close('#add-link-popover'); f7.popover.close('#add-link-popover');
} }

27
apps/spreadsheeteditor/mobile/src/page/main.jsx
View file

@ -107,12 +107,14 @@ class MainPage extends Component {
const wsLock = storeWorksheets.wsLock; const wsLock = storeWorksheets.wsLock;
const config = appOptions.config; 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 ) { if ( !Object.keys(config).length ) {
showLogo = !/&(?:logo)=/.test(window.location.search); showLogo = !/&(?:logo)=/.test(window.location.search);
} }
const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo)); const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo));
const isBranding = appOptions.canBranding || appOptions.canBrandingExt;
if ( $$('.skl-container').length ) { if ( $$('.skl-container').length ) {
$$('.skl-container').remove(); $$('.skl-container').remove();
} }
@ -120,16 +122,19 @@ class MainPage extends Component {
return ( return (
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */} {/* Top Navbar */}
<Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}> {config?.customization &&
{showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={ <Navbar id='editor-navbar'
() => { className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
window.open(`${__PUBLISHER_URL__}`, "_blank"); {(!isBranding && showLogo) && <div className="main-logo" onClick={() => {
}}><Icon icon="icon-logo"></Icon></div>} window.open(`${__PUBLISHER_URL__}`, "_blank");
<Subnavbar> }}><Icon icon="icon-logo"></Icon></div>}
<Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/> <Subnavbar>
<Search useSuspense={false}/> <Toolbar openOptions={this.handleClickToOpenOptions}
</Subnavbar> closeOptions={this.handleOptionsViewClosed}/>
</Navbar> <Search useSuspense={false}/>
</Subnavbar>
</Navbar>
}
<CellEditor onClickToOpenAddOptions={(panels, button) => this.handleClickToOpenOptions('add', {panels: panels, button: button})}/> <CellEditor onClickToOpenAddOptions={(panels, button) => this.handleClickToOpenOptions('add', {panels: panels, button: button})}/>
{/* Page content */} {/* Page content */}
<View id="editor_sdk" /> <View id="editor_sdk" />

4
apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx
View file

@ -346,7 +346,7 @@ const PageReorder = props => {
} }
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link icon='icon-expand-down' sheetClose></Link> <Link icon='icon-expand-down' sheetClose></Link>
@ -1522,7 +1522,7 @@ const EditChart = props => {
disableAxisPos, disableAxisPos,
needReverse needReverse
}}></ListItem> }}></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 onReorder: props.onReorder
}}></ListItem> }}></ListItem>
</List> </List>

2
apps/spreadsheeteditor/mobile/src/view/edit/EditImage.jsx
View file

@ -42,7 +42,7 @@ const PageReorder = props => {
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link icon='icon-expand-down' sheetClose></Link> <Link icon='icon-expand-down' sheetClose></Link>

2
apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
View file

@ -334,7 +334,7 @@ const PageReorder = props => {
return ( return (
<Page> <Page>
<Navbar title={_t.textReorder} backLink={_t.textBack}> <Navbar title={t('View.Edit.textArrange')} backLink={_t.textBack}>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>
<Link icon='icon-expand-down' sheetClose></Link> <Link icon='icon-expand-down' sheetClose></Link>