Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE mobile] Add Review Change in context menu

Browse source
This commit is contained in:
Julia Svinareva 2019-05-24 11:43:15 +03:00
parent 0e341287a1
commit 57aaf4c073
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/documenteditor/mobile/app/controller/DocumentHolder.js
View file

@ -58,7 +58,7 @@ define([
_fastCoAuthTips = [], _fastCoAuthTips = [],
_actionSheets = [], _actionSheets = [],
_isEdit = false, _isEdit = false,
_canAcceptChanges = false, _canReview = false,
_inRevisionChange = false, _inRevisionChange = false,
_menuPos = [], _menuPos = [],
_timer = 0; _timer = 0;
@ -100,7 +100,7 @@ define([
setMode: function (mode) { setMode: function (mode) {
_isEdit = mode.isEdit; _isEdit = mode.isEdit;
_canAcceptChanges = mode.canReview && !mode.isReviewOnly; _canReview = mode.canReview;
}, },
// When our application is ready, lets get started // When our application is ready, lets get started
@ -152,6 +152,11 @@ define([
var getCollaboration = DE.getController('Collaboration'); var getCollaboration = DE.getController('Collaboration');
getCollaboration.showModal(); getCollaboration.showModal();
getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false); getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false);
} else if('reviewchange' == eventName) {
var getCollaboration = DE.getController('Collaboration');
getCollaboration.showModal();
getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false);
getCollaboration.getView('Collaboration').showPage('#change-view', false);
} else if ('showActionSheet' == eventName && _actionSheets.length > 0) { } else if ('showActionSheet' == eventName && _actionSheets.length > 0) {
_.delay(function () { _.delay(function () {
_.each(_actionSheets, function (action) { _.each(_actionSheets, function (action) {
@ -491,7 +496,13 @@ define([
}); });
} }
if (_canAcceptChanges && _inRevisionChange) { if (_canReview) {
if (_inRevisionChange) {
menuItems.push({
caption: me.menuReviewChange,
event: 'reviewchange'
});
} else {
menuItems.push({ menuItems.push({
caption: me.menuReview, caption: me.menuReview,
event: 'review' event: 'review'
@ -499,6 +510,7 @@ define([
} }
} }
} }
}
if (isLink) { if (isLink) {
menuItems.push({ menuItems.push({
@ -540,7 +552,8 @@ define([
menuReview: 'Review', menuReview: 'Review',
menuMerge: 'Merge Cells', menuMerge: 'Merge Cells',
menuSplit: 'Split Cell', menuSplit: 'Split Cell',
menuDeleteTable: 'Delete Table' menuDeleteTable: 'Delete Table',
menuReviewChange: 'Review Change'
} }
})(), DE.Controllers.DocumentHolder || {})) })(), DE.Controllers.DocumentHolder || {}))
}); });

2
apps/documenteditor/mobile/app/view/Collaboration.js
View file

@ -151,7 +151,7 @@ define([
textMarkup: 'Markup', textMarkup: 'Markup',
textFinal: 'Final', textFinal: 'Final',
textOriginal: 'Original', textOriginal: 'Original',
textChange: 'Change' textChange: 'Review Change'
} }
})(), DE.Views.Collaboration || {})) })(), DE.Views.Collaboration || {}))

3
apps/documenteditor/mobile/locale/en.json
View file

@ -31,6 +31,7 @@
"DE.Controllers.DocumentHolder.textColumns": "Columns", "DE.Controllers.DocumentHolder.textColumns": "Columns",
"DE.Controllers.DocumentHolder.textRows": "Rows", "DE.Controllers.DocumentHolder.textRows": "Rows",
"DE.Controllers.DocumentHolder.menuDeleteTable": "Delete Table", "DE.Controllers.DocumentHolder.menuDeleteTable": "Delete Table",
"DE.Controllers.DocumentHolder.menuReviewChange": "Review Change",
"DE.Controllers.EditContainer.textChart": "Chart", "DE.Controllers.EditContainer.textChart": "Chart",
"DE.Controllers.EditContainer.textFooter": "Footer", "DE.Controllers.EditContainer.textFooter": "Footer",
"DE.Controllers.EditContainer.textHeader": "Header", "DE.Controllers.EditContainer.textHeader": "Header",
@ -495,5 +496,5 @@
"DE.Views.Collaboration.textMarkup": "Markup", "DE.Views.Collaboration.textMarkup": "Markup",
"DE.Views.Collaboration.textFinal": "Final", "DE.Views.Collaboration.textFinal": "Final",
"DE.Views.Collaboration.textOriginal": "Original", "DE.Views.Collaboration.textOriginal": "Original",
"DE.Views.Collaboration.textChange": "Change" "DE.Views.Collaboration.textChange": "Review Change"
} }