diff --git a/apps/common/mobile/lib/controller/collaboration/Comments.jsx b/apps/common/mobile/lib/controller/collaboration/Comments.jsx
index 86855daed..43cf13dfe 100644
--- a/apps/common/mobile/lib/controller/collaboration/Comments.jsx
+++ b/apps/common/mobile/lib/controller/collaboration/Comments.jsx
@@ -480,6 +480,10 @@ class ViewCommentsController extends Component {
}
const api = Common.EditorApi.get();
api.asc_changeComment(comment.uid, ascComment);
+
+ if(!this.props.storeApplicationSettings.isResolvedComments) {
+ this.closeViewCurComments();
+ }
}
}
deleteComment (comment) {
@@ -591,7 +595,7 @@ class ViewCommentsController extends Component {
const _CommentsController = inject('storeAppOptions', 'storeComments', 'users', "storeApplicationSettings")(observer(CommentsController));
const _AddCommentController = inject('storeAppOptions', 'storeComments', 'users')(observer(AddCommentController));
const _EditCommentController = inject('storeComments', 'users')(observer(EditCommentController));
-const _ViewCommentsController = inject('storeComments', 'users')(observer(withTranslation()(ViewCommentsController)));
+const _ViewCommentsController = inject('storeComments', 'users', "storeApplicationSettings")(observer(withTranslation()(ViewCommentsController)));
export {
_CommentsController as CommentsController,
diff --git a/apps/documenteditor/mobile/src/store/appOptions.js b/apps/documenteditor/mobile/src/store/appOptions.js
index b79cefe33..82c7c6afc 100644
--- a/apps/documenteditor/mobile/src/store/appOptions.js
+++ b/apps/documenteditor/mobile/src/store/appOptions.js
@@ -86,6 +86,8 @@ export class storeAppOptions {
this.canPlugins = false;
}
setPermissionOptions (document, licType, params, permissions, isSupportEditFeature) {
+ if (params.asc_getRights() !== Asc.c_oRights.Edit)
+ permissions.edit = permissions.review = false;
this.review = (permissions.review === undefined) ? (permissions.edit !== false) : permissions.review;
this.canAnalytics = params.asc_getIsAnalyticsEnable();
this.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
diff --git a/apps/presentationeditor/mobile/src/store/appOptions.js b/apps/presentationeditor/mobile/src/store/appOptions.js
index c2c95246f..9fca4e84b 100644
--- a/apps/presentationeditor/mobile/src/store/appOptions.js
+++ b/apps/presentationeditor/mobile/src/store/appOptions.js
@@ -64,6 +64,8 @@ export class storeAppOptions {
}
setPermissionOptions (document, licType, params, permissions, isSupportEditFeature) {
+ if (params.asc_getRights() !== Asc.c_oRights.Edit)
+ permissions.edit = false;
this.review = (permissions.review === undefined) ? (permissions.edit !== false) : permissions.review;
this.canAnalytics = params.asc_getIsAnalyticsEnable();
this.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
diff --git a/apps/spreadsheeteditor/mobile/src/store/appOptions.js b/apps/spreadsheeteditor/mobile/src/store/appOptions.js
index b426047ca..ce4a99ec8 100644
--- a/apps/spreadsheeteditor/mobile/src/store/appOptions.js
+++ b/apps/spreadsheeteditor/mobile/src/store/appOptions.js
@@ -71,7 +71,8 @@ export class storeAppOptions {
}
setPermissionOptions (document, licType, params, permissions, isSupportEditFeature) {
- permissions.edit = params.asc_getRights() !== Asc.c_oRights.Edit ? false : true;
+ if (params.asc_getRights() !== Asc.c_oRights.Edit)
+ permissions.edit = false;
this.canAutosave = true;
this.canAnalytics = params.asc_getIsAnalyticsEnable();
this.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
diff --git a/apps/spreadsheeteditor/mobile/src/store/applicationSettings.js b/apps/spreadsheeteditor/mobile/src/store/applicationSettings.js
index d18e04d2e..558d87230 100644
--- a/apps/spreadsheeteditor/mobile/src/store/applicationSettings.js
+++ b/apps/spreadsheeteditor/mobile/src/store/applicationSettings.js
@@ -28,13 +28,13 @@ export class storeApplicationSettings {
unitMeasurement = Common.Utils.Metric.getCurrentMetric();
macrosMode = 0;
- formulaLang = LocalStorage.getItem('sse-settings-func-lang') || dataLang[0].value;
+ formulaLang = LocalStorage.getItem('sse-settings-func-lang') || this.getFormulaLanguages()[0].value;
regCode = undefined;
regExample = '';
regData = [];
isRefStyle = false;
isComments = true;
- isResolvedComments = true;
+ isResolvedComments = true;
getFormulaLanguages() {
const dataLang = [
diff --git a/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx b/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx
index c1439de24..9367e06a9 100644
--- a/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx
@@ -1,6 +1,7 @@
import React, { useState } from 'react';
import { Input, View, Button, Link } from 'framework7-react';
+import {observer, inject} from "mobx-react";
const viewStyle = {
height: 30
@@ -12,6 +13,8 @@ const contentStyle = {
const CellEditorView = props => {
const [expanded, setExpanded] = useState(false);
+ const storeAppOptions = props.storeAppOptions;
+ const isEdit = storeAppOptions.isEdit;
const expandClick = e => {
setExpanded(!expanded);
@@ -20,7 +23,7 @@ const CellEditorView = props => {
return
@@ -33,4 +36,4 @@ const CellEditorView = props => {
;
};
-export default CellEditorView;
+export default inject("storeAppOptions")(observer(CellEditorView));
diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddFunction.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddFunction.jsx
index cd5c2db48..82cc52a23 100644
--- a/apps/spreadsheeteditor/mobile/src/view/add/AddFunction.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/add/AddFunction.jsx
@@ -26,6 +26,11 @@ const PageGroup = ({name, type, functions, onInsertFunction, f7router}) => {
if (functions[k].group == type)
items.push(functions[k]);
}
+
+ items.sort(function(a, b) {
+ return (a.caption.toLowerCase() > b.caption.toLowerCase()) ? 1 : -1;
+ });
+
return (
@@ -88,6 +93,7 @@ const AddFunction = props => {
name: name
})
}
+
return (