- {(comment.editable && displayMode === 'markup' && !wsProps?.Objects) &&
{onResolveComment(comment);}}>
}
- {(displayMode === 'markup' && !wsProps?.Objects) &&
+ {(comment.editable && displayMode === 'markup' && !wsProps?.Objects) &&
{!isViewer && onResolveComment(comment);}}>
}
+ {(displayMode === 'markup' && !wsProps?.Objects && !isViewer) &&
{openActionComment(true);}}>
@@ -839,14 +839,14 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
{reply.date}
- {isEdit && !viewMode && reply.editable &&
-
diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less
index f3a948d30..e2d628579 100644
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@@ -47,6 +47,11 @@
.subnavbar {
.subnavbar-inner {
padding: 0;
+ .title {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
.icon-back {
color: @toolbar-icons;
diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
index d173f9fb9..843fe3fe0 100644
--- a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
+++ b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
@@ -19,7 +19,8 @@ import EditorUIController from '../lib/patch';
users: stores.users,
isDisconnected: stores.users.isDisconnected,
displayMode: stores.storeReview.displayMode,
- dataDoc: stores.storeDocumentInfo.dataDoc
+ dataDoc: stores.storeDocumentInfo.dataDoc,
+ isViewer: stores.storeAppOptions.isViewer
}))
class ContextMenu extends ContextMenuController {
constructor(props) {
@@ -225,6 +226,7 @@ class ContextMenu extends ContextMenuController {
} else {
const { t } = this.props;
const _t = t("ContextMenu", { returnObjects: true });
+
f7.dialog.create({
title: t('Settings', {returnObjects: true}).notcriticalErrorTitle,
text : _t.txtWarnUrl,
@@ -256,7 +258,7 @@ class ContextMenu extends ContextMenuController {
initMenuItems() {
if ( !Common.EditorApi ) return [];
- const { isEdit, canFillForms, isDisconnected } = this.props;
+ const { isEdit, canFillForms, isDisconnected, isViewer } = this.props;
if (isEdit && EditorUIController.ContextMenu) {
return EditorUIController.ContextMenu.mapMenuItems(this);
@@ -296,36 +298,36 @@ class ContextMenu extends ContextMenuController {
let itemsIcon = [],
itemsText = [];
- if ( canCopy ) {
+ if (canCopy) {
itemsIcon.push({
event: 'copy',
icon: 'icon-copy'
});
}
- if(!isDisconnected) {
- if ( canFillForms && canCopy && !locked ) {
+ if (!isDisconnected) {
+ if (canFillForms && canCopy && !locked && !isViewer) {
itemsIcon.push({
event: 'cut',
icon: 'icon-cut'
});
}
- if ( canFillForms && canCopy && !locked ) {
+ if (canFillForms && canCopy && !locked && !isViewer) {
itemsIcon.push({
event: 'paste',
icon: 'icon-paste'
});
}
- if ( canViewComments && this.isComments ) {
+ if (canViewComments && this.isComments) {
itemsText.push({
caption: _t.menuViewComment,
event: 'viewcomment'
});
}
- if (api.can_AddQuotedComment() !== false && canCoAuthoring && canComments && !locked && !(!isText && isObject)) {
+ if (api.can_AddQuotedComment() !== false && canCoAuthoring && canComments && !locked && !(!isText && isObject) && !isViewer) {
itemsText.push({
caption: _t.menuAddComment,
event: 'addcomment'
@@ -333,14 +335,14 @@ class ContextMenu extends ContextMenuController {
}
}
- if ( isLink ) {
+ if (isLink) {
itemsText.push({
caption: _t.menuOpenLink,
event: 'openlink'
});
}
- if(inToc && isEdit) {
+ if(inToc && isEdit && !isViewer) {
itemsText.push({
caption: t('ContextMenu.textRefreshEntireTable'),
event: 'refreshEntireTable'
diff --git a/apps/documenteditor/mobile/src/controller/settings/Settings.jsx b/apps/documenteditor/mobile/src/controller/settings/Settings.jsx
index 6ba5bb7a6..07cb9e673 100644
--- a/apps/documenteditor/mobile/src/controller/settings/Settings.jsx
+++ b/apps/documenteditor/mobile/src/controller/settings/Settings.jsx
@@ -27,19 +27,6 @@ const Settings = props => {
}
};
- // const onReaderMode = () => {
- // const appOptions = props.storeAppOptions;
- // appOptions.changeReaderMode();
- //
- // Common.EditorApi.get().ChangeReaderMode();
- //
- // if (Device.phone) {
- // setTimeout(() => {
- // closeModal();
- // }, 1);
- // }
- // };
-
const onPrint = () => {
const api = Common.EditorApi.get();
@@ -109,7 +96,6 @@ const Settings = props => {
return
{
const isViewer = props.isViewer;
const isMobileView = props.isMobileView;
+ const shortTitle = (title) => {
+ const arrDocTitle = title.split('.');
+ const ext = arrDocTitle[1];
+ const name = arrDocTitle[0];
+
+ if(name.length > 7 && Device.phone) {
+ let shortName = name.substring(0, 7);
+ return `${shortName}...${ext}`;
+ }
+
+ return title;
+ };
+
return (
@@ -23,7 +36,7 @@ const ToolbarView = props => {
onRedoClick: props.onRedo
})}
- {(!Device.phone || isViewer) && {props.docTitle}}
+ {(!Device.phone || isViewer) && {shortTitle(props.docTitle)}}
{(Device.android && props.isEdit && !isViewer) && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({
disabledUndo: !props.isCanUndo,
diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
index 2a0d911fd..0cacc2067 100644
--- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
@@ -112,7 +112,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
let _isEdit = false,
_canDownload = false,
_canDownloadOrigin = false,
- // _canReader = false,
_canAbout = true,
_canHelp = true,
_canPrint = false;
@@ -122,7 +121,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
_canPrint = _canDownload = _canDownloadOrigin = false;
} else {
_isEdit = appOptions.isEdit;
- // _canReader = !appOptions.isEdit && !appOptions.isRestrictedEdit && appOptions.canReader;
_canDownload = appOptions.canDownload;
_canDownloadOrigin = appOptions.canDownloadOrigin;
_canPrint = appOptions.canPrint;
@@ -139,7 +137,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
{navbar}
- {/*disabled={appOptions.readerMode ? true : false}*/}
{!props.inPopover &&
@@ -158,12 +155,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
: null}
- {/*{_canReader &&*/}
- {/* /!*ToDo*!/*/}
- {/* */}
- {/* {props.onReaderMode()}}/>*/}
- {/* */}
- {/*}*/}
{Device.sailfish && _isEdit &&
{props.onOrthographyCheck()}} className='no-indicator' link="#">