diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 01b50d599f..c718dae558 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -391,7 +391,8 @@ "textType": "Type", "textWe": "We", "textWrap": "Wrap", - "textWrappingStyle": "Wrapping Style" + "textWrappingStyle": "Wrapping Style", + "textInvalidName": "The file name cannot contain any of the following characters: " }, "Error": { "convertationTimeoutText": "Conversion timeout exceeded.", diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 63e05a2d87..8e5538cd26 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -105,13 +105,14 @@ class MainController extends Component { value = localStorage.getItem("de-mobile-allow-macros-request"); this.props.storeApplicationSettings.changeMacrosRequest((value !== null) ? parseInt(value) : 0); + this.props.storeAppOptions.wopi = this.editorConfig.wopi; + Common.Notifications.trigger('configOptionsFill'); }; const loadDocument = data => { this.permissions = {}; this.document = data.doc; - let docInfo = {}; if (data.doc) { diff --git a/apps/documenteditor/mobile/src/controller/Toolbar.jsx b/apps/documenteditor/mobile/src/controller/Toolbar.jsx index a9182eced5..1fdef499ac 100644 --- a/apps/documenteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/controller/Toolbar.jsx @@ -27,9 +27,9 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto const disabledEditControls = storeToolbarSettings.disabledEditControls; const disabledSettings = storeToolbarSettings.disabledSettings; const showEditDocument = !appOptions.isEdit && appOptions.canEdit && appOptions.canRequestEditRights; - const docInfo = props.storeDocumentInfo; - const docExt = docInfo.dataDoc ? docInfo.dataDoc.fileType : ''; - const docTitle = docInfo.dataDoc ? docInfo.dataDoc.title : ''; + const storeDocumentInfo = props.storeDocumentInfo; + const docExt = storeDocumentInfo.dataDoc ? storeDocumentInfo.dataDoc.fileType : ''; + const docTitle = storeDocumentInfo.dataDoc ? storeDocumentInfo.dataDoc.title : ''; useEffect(() => { Common.Gateway.on('init', loadConfig); @@ -212,7 +212,24 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto title: t('Toolbar.textRenameFile'), text : t('Toolbar.textEnterNewFileName'), content: Device.ios ? - '
' : '