Merge pull request #1878 from ONLYOFFICE/feature/fix-bugs
[DE PE SSE mobile] Fix Bug 58287
This commit is contained in:
commit
6b072a7e68
|
@ -724,6 +724,12 @@ class MainController extends Component {
|
||||||
storeDocumentInfo.changeCount(this.objectInfo);
|
storeDocumentInfo.changeCount(this.objectInfo);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.api.asc_registerCallback('asc_onMeta', (meta) => {
|
||||||
|
if(meta) {
|
||||||
|
storeDocumentInfo.changeTitle(meta.title);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Color Schemes
|
// Color Schemes
|
||||||
|
|
||||||
this.api.asc_registerCallback('asc_onSendThemeColorSchemes', (arr) => {
|
this.api.asc_registerCallback('asc_onSendThemeColorSchemes', (arr) => {
|
||||||
|
|
|
@ -221,7 +221,7 @@
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
.sheet-modal-inner {
|
.sheet-modal-inner {
|
||||||
background: @background-tertiary;
|
background: @background-tertiary;
|
||||||
overflow-y: auto;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
&.sheet-modal-bottom:before, &.sheet-modal:not(.sheet-modal-top):before {
|
&.sheet-modal-bottom:before, &.sheet-modal:not(.sheet-modal-top):before {
|
||||||
display: none;
|
display: none;
|
||||||
|
|
|
@ -8,7 +8,8 @@ export class storeDocumentInfo {
|
||||||
dataDoc: observable,
|
dataDoc: observable,
|
||||||
switchIsLoaded: action,
|
switchIsLoaded: action,
|
||||||
changeCount: action,
|
changeCount: action,
|
||||||
setDataDoc: action
|
setDataDoc: action,
|
||||||
|
changeTitle: action
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,4 +46,8 @@ export class storeDocumentInfo {
|
||||||
setDataDoc(obj) {
|
setDataDoc(obj) {
|
||||||
this.dataDoc = obj;
|
this.dataDoc = obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
changeTitle(title) {
|
||||||
|
this.dataDoc.title = title;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -207,7 +207,7 @@ const EditParagraph = props => {
|
||||||
onStyleMenuDelete: props.onStyleMenuDelete
|
onStyleMenuDelete: props.onStyleMenuDelete
|
||||||
}}>
|
}}>
|
||||||
{curStyle &&
|
{curStyle &&
|
||||||
<div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: thumbSize.width + 'px', height: thumbSize.height + 'px', backgroundSize: thumbSize.width + 'px ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}></div>
|
<div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: '100% ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}></div>
|
||||||
}
|
}
|
||||||
</ListItem>
|
</ListItem>
|
||||||
</List>
|
</List>
|
||||||
|
@ -278,7 +278,7 @@ const EditParagraphStyle = props => {
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div slot="inner"
|
<div slot="inner"
|
||||||
style={{backgroundImage: 'url(' + style.image + ')', width: thumbSize.width + 'px', height: thumbSize.height + 'px', backgroundSize: thumbSize.width + 'px ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}
|
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: '100% ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}
|
||||||
></div>
|
></div>
|
||||||
{!api.asc_IsStyleDefault(style.name) && (
|
{!api.asc_IsStyleDefault(style.name) && (
|
||||||
<div slot="inner-end">
|
<div slot="inner-end">
|
||||||
|
@ -369,7 +369,7 @@ const ChangeNextParagraphStyle = props => {
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div slot="inner"
|
<div slot="inner"
|
||||||
style={{backgroundImage: 'url(' + style.image + ')', width: thumbSize.width + 'px', height: thumbSize.height + 'px', backgroundSize: thumbSize.width + 'px ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}
|
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: '100% ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}
|
||||||
></div>
|
></div>
|
||||||
</ListItem>
|
</ListItem>
|
||||||
))}
|
))}
|
||||||
|
|
|
@ -8,7 +8,6 @@ const PageDocumentInfo = (props) => {
|
||||||
const _t = t("Settings", { returnObjects: true });
|
const _t = t("Settings", { returnObjects: true });
|
||||||
const storeInfo = props.storeDocumentInfo;
|
const storeInfo = props.storeDocumentInfo;
|
||||||
const fileType = storeInfo.dataDoc.fileType;
|
const fileType = storeInfo.dataDoc.fileType;
|
||||||
|
|
||||||
const dataApp = props.getAppProps();
|
const dataApp = props.getAppProps();
|
||||||
|
|
||||||
const {
|
const {
|
||||||
|
|
|
@ -435,6 +435,16 @@ class MainController extends Component {
|
||||||
});
|
});
|
||||||
|
|
||||||
this.api.asc_registerCallback('asc_onReplaceAll', this.onApiTextReplaced.bind(this));
|
this.api.asc_registerCallback('asc_onReplaceAll', this.onApiTextReplaced.bind(this));
|
||||||
|
|
||||||
|
// Presentation Info
|
||||||
|
|
||||||
|
const storePresentationInfo = this.props.storePresentationInfo;
|
||||||
|
|
||||||
|
this.api.asc_registerCallback('asc_onMeta', (meta) => {
|
||||||
|
if(meta) {
|
||||||
|
storePresentationInfo.changeTitle(meta.title);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
onApiTextReplaced(found, replaced) {
|
onApiTextReplaced(found, replaced) {
|
||||||
|
|
|
@ -2,10 +2,11 @@ import { action, observable, makeObservable } from "mobx";
|
||||||
|
|
||||||
export class storePresentationInfo {
|
export class storePresentationInfo {
|
||||||
constructor() {
|
constructor() {
|
||||||
makeObservable(this, {
|
makeObservable(this, {
|
||||||
dataDoc: observable,
|
dataDoc: observable,
|
||||||
setDataDoc: action
|
setDataDoc: action,
|
||||||
});
|
changeTitle: action
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
dataDoc;
|
dataDoc;
|
||||||
|
@ -13,4 +14,8 @@ export class storePresentationInfo {
|
||||||
setDataDoc(obj) {
|
setDataDoc(obj) {
|
||||||
this.dataDoc = obj;
|
this.dataDoc = obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
changeTitle(title) {
|
||||||
|
this.dataDoc.title = title;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -439,6 +439,18 @@ class MainController extends Component {
|
||||||
|
|
||||||
this.api.asc_registerCallback('asc_onEntriesListMenu', this.onEntriesListMenu.bind(this, false));
|
this.api.asc_registerCallback('asc_onEntriesListMenu', this.onEntriesListMenu.bind(this, false));
|
||||||
this.api.asc_registerCallback('asc_onValidationListMenu', this.onEntriesListMenu.bind(this, true));
|
this.api.asc_registerCallback('asc_onValidationListMenu', this.onEntriesListMenu.bind(this, true));
|
||||||
|
|
||||||
|
// Spreadsheet Info
|
||||||
|
|
||||||
|
const storeSpreadsheetInfo = this.props.storeSpreadsheetInfo;
|
||||||
|
|
||||||
|
this.api.asc_registerCallback('asc_onMeta', (meta) => {
|
||||||
|
if(meta) {
|
||||||
|
storeSpreadsheetInfo.changeTitle(meta.title);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onEntriesListMenu(validation, textArr, addArr) {
|
onEntriesListMenu(validation, textArr, addArr) {
|
||||||
|
|
|
@ -4,7 +4,8 @@ export class storeSpreadsheetInfo {
|
||||||
constructor() {
|
constructor() {
|
||||||
makeObservable(this, {
|
makeObservable(this, {
|
||||||
dataDoc: observable,
|
dataDoc: observable,
|
||||||
setDataDoc: action
|
setDataDoc: action,
|
||||||
|
changeTitle: action
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,4 +14,8 @@ export class storeSpreadsheetInfo {
|
||||||
setDataDoc(obj) {
|
setDataDoc(obj) {
|
||||||
this.dataDoc = obj;
|
this.dataDoc = obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
changeTitle(title) {
|
||||||
|
this.dataDoc.title = title;
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue