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

Merge pull request #929 from ONLYOFFICE/feature/bug-fixes

Browse source 
Feature/bug fixes
This commit is contained in:
maxkadushkin 2021-06-18 17:03:08 +03:00 committed by GitHub
parent aa83274afc 10e10ca77b
commit 0c95c2ec2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 100 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/mobile/lib/controller/Plugins.jsx
View file

@ -46,7 +46,6 @@ const PluginsController = inject('storeAppOptions')(observer(props => {
api.asc_pluginButtonClick(index); api.asc_pluginButtonClick(index);
}; };
const showPluginModal = (plugin, variationIndex, frameId, urlAddition) => { const showPluginModal = (plugin, variationIndex, frameId, urlAddition) => {
let isAndroid = Device.android; let isAndroid = Device.android;
let variation = plugin.get_Variations()[variationIndex]; let variation = plugin.get_Variations()[variationIndex];
@ -68,7 +67,8 @@ const PluginsController = inject('storeAppOptions')(observer(props => {
if ((storeAppOptions.isEdit || b.isViewer !== false)) { if ((storeAppOptions.isEdit || b.isViewer !== false)) {
newBtns[index] = { newBtns[index] = {
text: b.text, text: b.text,
attributes: {result: index} attributes: {result: index},
close: false
}; };
} }
}); });
@ -123,8 +123,8 @@ const PluginsController = inject('storeAppOptions')(observer(props => {
}; };
const pluginClose = plugin => { const pluginClose = plugin => {
if (iframe) { if (plugin) {
iframe = null; modal.close();
} }
}; };

3
apps/common/mobile/resources/less/common.less
View file

@ -784,9 +784,6 @@ input[type="number"]::-webkit-inner-spin-button {
padding: 0; padding: 0;
text-align: left; text-align: left;
font-size: 16px; font-size: 16px;
span {
padding: 0;
}
} }
} }
.picker-center-highlight { .picker-center-highlight {

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

@ -134,14 +134,14 @@
}, },
"Toolbar": { "Toolbar": {
"dlgLeaveTitleText": "You leave the application", "dlgLeaveTitleText": "You leave the application",
"dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.", "dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
"leaveButtonText": "Leave this Page", "leaveButtonText": "Leave this Page",
"stayButtonText": "Stay on this Page" "stayButtonText": "Stay on this Page"
}, },
"Common": { "Common": {
"ThemeColorPalette": { "ThemeColorPalette": {
"textThemeColors": "Theme Colors", "textThemeColors": "Theme Colors",
"textStandartColors": "Standart Colors", "textStandartColors": "Standard Colors",
"textCustomColors": "Custom Colors" "textCustomColors": "Custom Colors"
}, },
"Collaboration": { "Collaboration": {

10
apps/documenteditor/mobile/src/less/icons-material.less
View file

@ -26,6 +26,16 @@
height: 22px; height: 22px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{navBarIconColor}"><g><path d="M12.1,2H9.9C9.6,2,9.4,2.2,9.3,2.5L8.8,4.9c0,0.2-0.2,0.3-0.3,0.3s-0.1,0-0.2-0.1L6.2,3.8C6.1,3.7,6,3.7,5.8,3.7c-0.1,0-0.3,0-0.4,0.1L3.8,5.4c-0.1,0.2-0.2,0.5,0,0.8l1.3,2.1c0.1,0.2,0.1,0.4-0.2,0.5L2.5,9.3C2.2,9.4,2,9.6,2,9.9v2.2c0,0.3,0.2,0.5,0.5,0.6l2.4,0.5c0.3,0.1,0.4,0.3,0.2,0.5l-1.3,2.1c-0.2,0.2-0.1,0.6,0.1,0.8l1.6,1.6c0.1,0.1,0.3,0.2,0.4,0.2s0.2,0,0.3-0.1L8.3,17c0.1-0.1,0.1-0.1,0.2-0.1s0.3,0.1,0.3,0.3l0.5,2.3C9.4,19.8,9.6,20,9.9,20h2.2c0.3,0,0.5-0.2,0.6-0.5l0.5-2.4c0-0.2,0.1-0.3,0.3-0.3c0.1,0,0.1,0,0.2,0.1l2.1,1.3c0.1,0.1,0.2,0.1,0.3,0.1c0.2,0,0.3-0.1,0.4-0.2l1.6-1.6c0.2-0.2,0.2-0.5,0.1-0.8l-1.3-2.1c-0.2-0.2-0.1-0.5,0.2-0.5l2.4-0.5c0.3-0.1,0.5-0.3,0.5-0.6V9.8c0-0.3-0.2-0.5-0.5-0.6l-2.4-0.5c-0.3-0.1-0.4-0.3-0.2-0.5l1.3-2.1c0.2-0.2,0.1-0.6-0.1-0.8l-1.6-1.6c-0.1-0.1-0.3-0.2-0.4-0.2s-0.2,0-0.3,0.1l-2.1,1.3C13.6,5,13.6,5,13.5,5s-0.3-0.1-0.3-0.3l-0.5-2.2C12.6,2.2,12.4,2,12.1,2L12.1,2z M11,14.5c-1.9,0-3.5-1.6-3.5-3.5S9.1,7.5,11,7.5s3.5,1.6,3.5,3.5S12.9,14.5,11,14.5L11,14.5z"/></g></svg>'); .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{navBarIconColor}"><g><path d="M12.1,2H9.9C9.6,2,9.4,2.2,9.3,2.5L8.8,4.9c0,0.2-0.2,0.3-0.3,0.3s-0.1,0-0.2-0.1L6.2,3.8C6.1,3.7,6,3.7,5.8,3.7c-0.1,0-0.3,0-0.4,0.1L3.8,5.4c-0.1,0.2-0.2,0.5,0,0.8l1.3,2.1c0.1,0.2,0.1,0.4-0.2,0.5L2.5,9.3C2.2,9.4,2,9.6,2,9.9v2.2c0,0.3,0.2,0.5,0.5,0.6l2.4,0.5c0.3,0.1,0.4,0.3,0.2,0.5l-1.3,2.1c-0.2,0.2-0.1,0.6,0.1,0.8l1.6,1.6c0.1,0.1,0.3,0.2,0.4,0.2s0.2,0,0.3-0.1L8.3,17c0.1-0.1,0.1-0.1,0.2-0.1s0.3,0.1,0.3,0.3l0.5,2.3C9.4,19.8,9.6,20,9.9,20h2.2c0.3,0,0.5-0.2,0.6-0.5l0.5-2.4c0-0.2,0.1-0.3,0.3-0.3c0.1,0,0.1,0,0.2,0.1l2.1,1.3c0.1,0.1,0.2,0.1,0.3,0.1c0.2,0,0.3-0.1,0.4-0.2l1.6-1.6c0.2-0.2,0.2-0.5,0.1-0.8l-1.3-2.1c-0.2-0.2-0.1-0.5,0.2-0.5l2.4-0.5c0.3-0.1,0.5-0.3,0.5-0.6V9.8c0-0.3-0.2-0.5-0.5-0.6l-2.4-0.5c-0.3-0.1-0.4-0.3-0.2-0.5l1.3-2.1c0.2-0.2,0.1-0.6-0.1-0.8l-1.6-1.6c-0.1-0.1-0.3-0.2-0.4-0.2s-0.2,0-0.3,0.1l-2.1,1.3C13.6,5,13.6,5,13.5,5s-0.3-0.1-0.3-0.3l-0.5-2.2C12.6,2.2,12.4,2,12.1,2L12.1,2z M11,14.5c-1.9,0-3.5-1.6-3.5-3.5S9.1,7.5,11,7.5s3.5,1.6,3.5,3.5S12.9,14.5,11,14.5L11,14.5z"/></g></svg>');
} }
&.icon-prev {
width: 20px;
height: 20px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22" fill="@{navBarIconColor}"><g><polygon points="5.1,10.9 13.9,2 16,4.1 9.2,11.1 16,17.9 13.9,20 5.1,11.2 5,11.1 "/></g></svg>');
}
&.icon-next {
width: 20px;
height: 20px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22" fill="@{navBarIconColor}"><g><polygon points="16.9,10.9 8.1,2 6,4.1 12.8,11.1 6,17.9 8.1,20 16.9,11.2 17,11.1 "/></g></svg>');
}
&.icon-expand-down { &.icon-expand-down {
width: 22px; width: 22px;
height: 22px; height: 22px;

2
apps/documenteditor/mobile/src/view/edit/Edit.jsx
View file

@ -202,7 +202,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => {
editors.length > 1 ? editors.length > 1 ?
<div className='tab-buttons tabbar'> <div className='tab-buttons tabbar'>
{editors.map((item, index) => <Link key={"de-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)} {editors.map((item, index) => <Link key={"de-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)}
{isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.lenght + '%'}}></span>} {isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.length + '%'}}></span>}
</div> : </div> :
<NavTitle>{ editors[0].caption }</NavTitle> <NavTitle>{ editors[0].caption }</NavTitle>
} }

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

@ -147,6 +147,7 @@ const PageStyle = props => {
const types = storeChartSettings.types; const types = storeChartSettings.types;
const curType = chartProperties ? chartProperties.getType() : null; const curType = chartProperties ? chartProperties.getType() : null;
const chartStyles = storeChartSettings.chartStyles; const chartStyles = storeChartSettings.chartStyles;
const isAndroid = Device.android;
// console.log(chartStyles, curType); // console.log(chartStyles, curType);
// console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom); // console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom);
@ -184,6 +185,7 @@ const PageStyle = props => {
{chartStyles ? <Link key={"de-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null} {chartStyles ? <Link key={"de-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null}
<Link key={"de-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link> <Link key={"de-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link>
<Link key={"de-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link> <Link key={"de-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

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

@ -144,6 +144,7 @@ const PageStyle = props => {
const _t = t('Edit', {returnObjects: true}); const _t = t('Edit', {returnObjects: true});
const storeShapeSettings = props.storeShapeSettings; const storeShapeSettings = props.storeShapeSettings;
const shapeObject = props.storeFocusObjects.shapeObject; const shapeObject = props.storeFocusObjects.shapeObject;
const isAndroid = Device.android;
let borderSize, borderType, transparent; let borderSize, borderType, transparent;
if (shapeObject) { if (shapeObject) {
@ -177,9 +178,10 @@ const PageStyle = props => {
<Page> <Page>
<Navbar backLink={_t.textBack}> <Navbar backLink={_t.textBack}>
<div className='tab-buttons tabbar'> <div className='tab-buttons tabbar'>
<Link key={"de-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link> <Link key={"de-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link>
<Link key={"de-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link> <Link key={"de-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link>
<Link key={"de-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link> <Link key={"de-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

8
apps/documenteditor/mobile/src/view/edit/EditTable.jsx
View file

@ -466,6 +466,7 @@ const PageStyle = props => {
const _t = t('Edit', {returnObjects: true}); const _t = t('Edit', {returnObjects: true});
const storeTableSettings = props.storeTableSettings; const storeTableSettings = props.storeTableSettings;
const templates = storeTableSettings.styles; const templates = storeTableSettings.styles;
const isAndroid = Device.android;
const tableObject = props.storeFocusObjects.tableObject; const tableObject = props.storeFocusObjects.tableObject;
if (!tableObject && Device.phone) { if (!tableObject && Device.phone) {
@ -477,9 +478,10 @@ const PageStyle = props => {
<Page> <Page>
<Navbar backLink={_t.textBack}> <Navbar backLink={_t.textBack}>
<div className="tab-buttons tabbar"> <div className="tab-buttons tabbar">
<Link key={"de-link-table-style"} tabLink={"#edit-table-style"} tabLinkActive={true}>{_t.textStyle}</Link> <Link key={"de-link-table-style"} tabLink={"#edit-table-style"} tabLinkActive={true}>{_t.textStyle}</Link>
<Link key={"de-link-table-fill"} tabLink={"#edit-table-fill"}>{_t.textFill}</Link> <Link key={"de-link-table-fill"} tabLink={"#edit-table-fill"}>{_t.textFill}</Link>
<Link key={"de-link-table-border"} tabLink={"#edit-table-border"}>{_t.textBorder}</Link> <Link key={"de-link-table-border"} tabLink={"#edit-table-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

2
apps/presentationeditor/mobile/locale/en.json
View file

@ -148,7 +148,7 @@
}, },
"Toolbar": { "Toolbar": {
"dlgLeaveTitleText": "You leave the application", "dlgLeaveTitleText": "You leave the application",
"dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.", "dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
"leaveButtonText": "Leave this Page", "leaveButtonText": "Leave this Page",
"stayButtonText": "Stay on this Page" "stayButtonText": "Stay on this Page"
}, },

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

@ -231,7 +231,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => {
editors.length > 1 ? editors.length > 1 ?
<div className='tab-buttons tabbar'> <div className='tab-buttons tabbar'>
{editors.map((item, index) => <Link key={"pe-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)} {editors.map((item, index) => <Link key={"pe-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)}
{isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.lenght + '%'}}></span>} {isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.length + '%'}}></span>}
</div> : </div> :
<NavTitle>{ editors[0].caption }</NavTitle> <NavTitle>{ editors[0].caption }</NavTitle>
} }

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

@ -159,6 +159,7 @@ const PageStyle = props => {
const styles = storeChartSettings.styles; const styles = storeChartSettings.styles;
const shapeObject = props.storeFocusObjects.shapeObject; const shapeObject = props.storeFocusObjects.shapeObject;
const chartStyles = storeChartSettings.chartStyles; const chartStyles = storeChartSettings.chartStyles;
const isAndroid = Device.android;
let borderSize, borderType, borderColor; let borderSize, borderType, borderColor;
@ -194,6 +195,7 @@ const PageStyle = props => {
{chartStyles ? <Link key={"pe-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null} {chartStyles ? <Link key={"pe-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null}
<Link key={"pe-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link> <Link key={"pe-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link>
<Link key={"pe-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link> <Link key={"pe-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

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

@ -89,6 +89,7 @@ const PageStyle = props => {
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const storeShapeSettings = props.storeShapeSettings; const storeShapeSettings = props.storeShapeSettings;
const shapeObject = storeFocusObjects.shapeObject; const shapeObject = storeFocusObjects.shapeObject;
const isAndroid = Device.android;
let borderSize, borderType, transparent; let borderSize, borderType, transparent;
if (shapeObject) { if (shapeObject) {
@ -125,6 +126,7 @@ const PageStyle = props => {
<Link key={"pe-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link> <Link key={"pe-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link>
<Link key={"pe-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link> <Link key={"pe-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link>
<Link key={"pe-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link> <Link key={"pe-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

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

@ -310,7 +310,7 @@ const PageTransition = props => {
</ListItem> </ListItem>
</List> </List>
<List className="buttons-list"> <List className="buttons-list">
<ListItem href="#" className="button button-raised button-fill" onClick={props.onApplyAll}>{_t.textApplyAll}</ListItem> <ListButton className="button-fill button-raised" onClick={props.onApplyAll}>{_t.textApplyAll}</ListButton>
</List> </List>
</Page> </Page>
); );

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

@ -313,14 +313,16 @@ const PageStyle = props => {
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const storeTableSettings = props.storeTableSettings; const storeTableSettings = props.storeTableSettings;
const templates = storeTableSettings.styles; const templates = storeTableSettings.styles;
const isAndroid = Device.android;
return ( return (
<Page> <Page>
<Navbar backLink={_t.textBack}> <Navbar backLink={_t.textBack}>
<div className="tab-buttons tabbar"> <div className="tab-buttons tabbar">
<Link key={"pe-link-table-style"} tabLink={"#edit-table-style"} tabLinkActive={true}>{_t.textStyle}</Link> <Link key={"pe-link-table-style"} tabLink={"#edit-table-style"} tabLinkActive={true}>{_t.textStyle}</Link>
<Link key={"pe-link-table-fill"} tabLink={"#edit-table-fill"}>{_t.textFill}</Link> <Link key={"pe-link-table-fill"} tabLink={"#edit-table-fill"}>{_t.textFill}</Link>
<Link key={"pe-link-table-border"} tabLink={"#edit-table-border"}>{_t.textBorder}</Link> <Link key={"pe-link-table-border"} tabLink={"#edit-table-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

10
apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx
View file

@ -16,14 +16,14 @@ const PageApplicationSettings = props => {
}; };
// set mode // set mode
// const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
// const _isEdit = appOptions.isEdit; const _isEdit = appOptions.isEdit;
// const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true;
return ( return (
<Page> <Page>
<Navbar title={_t.textApplicationSettings} backLink={_t.textBack} /> <Navbar title={_t.textApplicationSettings} backLink={_t.textBack} />
{/* {_isEdit && */} {_isEdit &&
<Fragment> <Fragment>
<BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle> <BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle>
<List> <List>
@ -46,7 +46,7 @@ const PageApplicationSettings = props => {
</ListItem> </ListItem>
</List> </List>
</Fragment> </Fragment>
{/* } */} }
{/* {_isShowMacros && */} {/* {_isShowMacros && */}
<List mediaList> <List mediaList>
<ListItem title={_t.textMacrosSettings} link="/macros-settings/" routeProps={{ <ListItem title={_t.textMacrosSettings} link="/macros-settings/" routeProps={{
@ -84,7 +84,7 @@ const PageMacrosSettings = props => {
); );
}; };
const ApplicationSettings = inject("storeApplicationSettings")(observer(PageApplicationSettings)); const ApplicationSettings = inject("storeApplicationSettings", "storeAppOptions")(observer(PageApplicationSettings));
const MacrosSettings = inject("storeApplicationSettings")(observer(PageMacrosSettings)); const MacrosSettings = inject("storeApplicationSettings")(observer(PageMacrosSettings));
export {ApplicationSettings, MacrosSettings}; export {ApplicationSettings, MacrosSettings};

8
apps/presentationeditor/mobile/src/view/settings/Settings.jsx
View file

@ -130,9 +130,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => {
<Icon slot="media" icon="icon-collaboration"></Icon> <Icon slot="media" icon="icon-collaboration"></Icon>
</ListItem> </ListItem>
: null} : null}
<ListItem link="#" title={_t.textPresentationSettings} onClick={onoptionclick.bind(this, '/presentation-settings/')}> {_isEdit &&
<Icon slot="media" icon="icon-setup"></Icon> <ListItem link="#" title={_t.textPresentationSettings} onClick={onoptionclick.bind(this, '/presentation-settings/')}>
</ListItem> <Icon slot="media" icon="icon-setup"></Icon>
</ListItem>
}
<ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}> <ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}>
<Icon slot="media" icon="icon-app-settings"></Icon> <Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem> </ListItem>

2
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -193,7 +193,7 @@
}, },
"Toolbar": { "Toolbar": {
"dlgLeaveTitleText": "You leave the application", "dlgLeaveTitleText": "You leave the application",
"dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.", "dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
"leaveButtonText": "Leave this Page", "leaveButtonText": "Leave this Page",
"stayButtonText": "Stay on this Page" "stayButtonText": "Stay on this Page"
}, },

3
apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx
View file

@ -94,7 +94,8 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady
'</div>' + '</div>' +
'<div id="txt-encoding" class="small"></div>' + '<div id="txt-encoding" class="small"></div>' +
'</div>', '</div>',
buttons: buttons buttons: buttons,
cssClass: 'dlg-adv-options'
}).open(); }).open();
const recommendedSettings = advOptions.asc_getRecommendedSettings(); const recommendedSettings = advOptions.asc_getRecommendedSettings();

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

@ -296,7 +296,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => {
editors.length > 1 ? editors.length > 1 ?
<div className='tab-buttons tabbar'> <div className='tab-buttons tabbar'>
{editors.map((item, index) => <Link key={"sse-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)} {editors.map((item, index) => <Link key={"sse-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)}
{isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.lenght + '%'}}></span>} {isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.length + '%'}}></span>}
</div> : </div> :
<NavTitle>{ editors[0].caption }</NavTitle> <NavTitle>{ editors[0].caption }</NavTitle>
} }

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

@ -147,6 +147,7 @@ const PageBorderColor = props => {
const PageStyle = props => { const PageStyle = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const isAndroid = Device.android;
const storeChartSettings = props.storeChartSettings; const storeChartSettings = props.storeChartSettings;
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties();
@ -195,6 +196,7 @@ const PageStyle = props => {
{chartStyles ? <Link key={"sse-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null} {chartStyles ? <Link key={"sse-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null}
<Link key={"sse-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link> <Link key={"sse-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link>
<Link key={"sse-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link> <Link key={"sse-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

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

@ -83,6 +83,7 @@ const PaletteFill = inject("storeFocusObjects", "storeShapeSettings", "storePale
const PageStyle = props => { const PageStyle = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const isAndroid = Device.android;
const storeShapeSettings = props.storeShapeSettings; const storeShapeSettings = props.storeShapeSettings;
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const shapeObject = storeFocusObjects.shapeObject.get_ShapeProperties(); const shapeObject = storeFocusObjects.shapeObject.get_ShapeProperties();
@ -121,6 +122,7 @@ const PageStyle = props => {
<Link key={"se-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link> <Link key={"se-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link>
<Link key={"se-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link> <Link key={"se-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link>
<Link key={"se-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link> <Link key={"se-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

71
apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
View file

@ -27,14 +27,14 @@ const PageApplicationSettings = props => {
}; };
// set mode // set mode
// const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
// const _isEdit = appOptions.isEdit; const _isEdit = appOptions.isEdit;
// const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true;
return ( return (
<Page> <Page>
<Navbar title={_t.textApplicationSettings} backLink={_t.textBack} /> <Navbar title={_t.textApplicationSettings} backLink={_t.textBack} />
{/* {_isEdit && */} {_isEdit &&
<Fragment> <Fragment>
<BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle> <BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle>
<List> <List>
@ -59,39 +59,40 @@ const PageApplicationSettings = props => {
onRegSettings: props.onRegSettings onRegSettings: props.onRegSettings
}}></ListItem> }}></ListItem>
</List> </List>
<BlockTitle>{_t.textCommentingDisplay}</BlockTitle>
<List>
<ListItem>
<span>{_t.textComments}</span>
<Toggle checked={isComments}
onChange={() => {
storeApplicationSettings.changeDisplayComments(!isComments);
props.onChangeDisplayComments(!isComments);
}}
/>
</ListItem>
<ListItem>
<span>{_t.textResolvedComments}</span>
<Toggle checked={isResolvedComments} disabled={!isComments}
onChange={() => {
storeApplicationSettings.changeDisplayResolved(!isResolvedComments);
props.onChangeDisplayResolved(!isResolvedComments);
}}
/>
</ListItem>
</List>
<List>
<ListItem>
<span>{_t.textR1C1Style}</span>
<Toggle checked={isRefStyle}
onChange={() => {
storeApplicationSettings.changeRefStyle(!isRefStyle);
props.clickR1C1Style(!isRefStyle);
}}
/>
</ListItem>
</List>
</Fragment> </Fragment>
}
<BlockTitle>{_t.textCommentingDisplay}</BlockTitle>
<List>
<ListItem>
<span>{_t.textComments}</span>
<Toggle checked={isComments}
onChange={() => {
storeApplicationSettings.changeDisplayComments(!isComments);
props.onChangeDisplayComments(!isComments);
}}
/>
</ListItem>
<ListItem>
<span>{_t.textResolvedComments}</span>
<Toggle checked={isResolvedComments} disabled={!isComments}
onChange={() => {
storeApplicationSettings.changeDisplayResolved(!isResolvedComments);
props.onChangeDisplayResolved(!isResolvedComments);
}}
/>
</ListItem>
</List>
<List>
<ListItem>
<span>{_t.textR1C1Style}</span>
<Toggle checked={isRefStyle}
onChange={() => {
storeApplicationSettings.changeRefStyle(!isRefStyle);
props.clickR1C1Style(!isRefStyle);
}}
/>
</ListItem>
</List>
{/* } */} {/* } */}
{/* {_isShowMacros && */} {/* {_isShowMacros && */}
<List> <List>

8
apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx
View file

@ -138,9 +138,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => {
<Icon slot="media" icon="icon-collaboration"></Icon> <Icon slot="media" icon="icon-collaboration"></Icon>
</ListItem> </ListItem>
: null} : null}
<ListItem link="#" title={_t.textSpreadsheetSettings} onClick={onoptionclick.bind(this, '/spreadsheet-settings/')}> {_isEdit &&
<Icon slot="media" icon="icon-table-settings"></Icon> <ListItem link="#" title={_t.textSpreadsheetSettings} onClick={onoptionclick.bind(this, '/spreadsheet-settings/')}>
</ListItem> <Icon slot="media" icon="icon-table-settings"></Icon>
</ListItem>
}
<ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}> <ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}>
<Icon slot="media" icon="icon-app-settings"></Icon> <Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem> </ListItem>