diff --git a/apps/documenteditor/mobile/src/app.js b/apps/documenteditor/mobile/src/app.js
index dc39d91b66..cc94451538 100644
--- a/apps/documenteditor/mobile/src/app.js
+++ b/apps/documenteditor/mobile/src/app.js
@@ -36,9 +36,9 @@ Framework7.use(Framework7React)
ReactDOM.render(
-
+ {/**/}
-
+ {/**/}
,
document.getElementById('app'),
diff --git a/apps/documenteditor/mobile/src/controller/Error.jsx b/apps/documenteditor/mobile/src/controller/Error.jsx
index 6910f56b6f..7a9f49a263 100644
--- a/apps/documenteditor/mobile/src/controller/Error.jsx
+++ b/apps/documenteditor/mobile/src/controller/Error.jsx
@@ -13,7 +13,7 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
});
return () => {
const api = Common.EditorApi.get();
- api.asc_unregisterCallback('asc_onError', onError);
+ if ( api ) api.asc_unregisterCallback('asc_onError', onError);
}
});
diff --git a/apps/documenteditor/mobile/src/controller/LongActions.jsx b/apps/documenteditor/mobile/src/controller/LongActions.jsx
index f6e31b73de..28343acc5f 100644
--- a/apps/documenteditor/mobile/src/controller/LongActions.jsx
+++ b/apps/documenteditor/mobile/src/controller/LongActions.jsx
@@ -35,9 +35,11 @@ const LongActionsController = () => {
return ( () => {
const api = Common.EditorApi.get();
- api.asc_unregisterCallback('asc_onStartAction', onLongActionBegin);
- api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd);
- api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument);
+ if ( api ) {
+ api.asc_unregisterCallback('asc_onStartAction', onLongActionBegin);
+ api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd);
+ api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument);
+ }
Common.Notifications.off('preloader:endAction', onLongActionEnd);
Common.Notifications.off('preloader:beginAction', onLongActionBegin);
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index b39ad5f694..e3cd774e16 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -279,7 +279,7 @@ class MainController extends Component {
});
Common.Notifications.trigger('engineCreated', this.api);
- Common.EditorApi = {get: () => this.api};
+ // Common.EditorApi = {get: () => this.api};
// Set font rendering mode
let value = LocalStorage.getItem("de-settings-fontrender");
@@ -405,7 +405,9 @@ class MainController extends Component {
}
applyLicense () {
- const _t = this._t;
+ const { t } = this.props;
+ const _t = t('Main', {returnObjects:true});
+
const warnNoLicense = _t.warnNoLicense.replace(/%1/g, __COMPANY_NAME__);
const warnNoLicenseUsers = _t.warnNoLicenseUsers.replace(/%1/g, __COMPANY_NAME__);
const textNoLicenseTitle = _t.textNoLicenseTitle.replace(/%1/g, __COMPANY_NAME__);
@@ -851,6 +853,7 @@ class MainController extends Component {
}
componentDidMount() {
+ Common.EditorApi = {get: () => this.api};
this.initSdk();
}
}
diff --git a/apps/documenteditor/mobile/src/index_dev.html b/apps/documenteditor/mobile/src/index_dev.html
index a0ead6c1ae..9df63310fa 100644
--- a/apps/documenteditor/mobile/src/index_dev.html
+++ b/apps/documenteditor/mobile/src/index_dev.html
@@ -22,17 +22,128 @@
-
+
+
+