pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 04:31:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/mobile-apps-on-reactjs-new-test' into feature/mobile-apps-on-reactjs

Browse Source
This commit is contained in:
JuliaSvinareva
2020-12-02 20:40:35 +03:00
parent 4ada862a73 311bea0eb8
commit ec6c451f28
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/documenteditor/mobile/src/controller/settings/ApplicationSettings.jsx
View File

@ -4,6 +4,7 @@ import { ApplicationSettings } from "../../view/settings/ApplicationSettings";
class ApplicationSettingsController extends Component {
constructor(props) {
super(props);
this.switchDisplayComments = this.switchDisplayComments.bind(this);
}
setUnitMeasurement(value) {

7
apps/documenteditor/mobile/src/controller/settings/Download.jsx
View File

@ -28,7 +28,12 @@ class DownloadController extends Component {
(format === Asc.c_oAscFileType.TXT) ? t("Settings.textDownloadTxt") : t("Settings.textDownloadRtf"),
t("Settings.notcriticalErrorTitle"),
function () {
api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
if (format == Asc.c_oAscFileType.TXT) {
// ToDo: choose txt options
}
else {
api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
}
}
);
}

2
apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx
View File

@ -75,7 +75,7 @@ const PageApplicationSettings = props => {
</ListItem>
<ListItem>
<span>{_t.textResolvedComments}</span>
<Toggle checked={isResolvedComments} disabled={!isComments ? true : false}
<Toggle checked={isResolvedComments} disabled={!isComments}
onChange={() => {
store.changeDisplayResolved(!isResolvedComments);
props.switchDisplayResolved(!isResolvedComments);