diff --git a/apps/documenteditor/mobile/app/controller/DocumentHolder.js b/apps/documenteditor/mobile/app/controller/DocumentHolder.js index 2e126ea84..cc5a81647 100644 --- a/apps/documenteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/documenteditor/mobile/app/controller/DocumentHolder.js @@ -58,7 +58,7 @@ define([ _fastCoAuthTips = [], _actionSheets = [], _isEdit = false, - _canAcceptChanges = false, + _canReview = false, _inRevisionChange = false, _menuPos = [], _timer = 0; @@ -100,7 +100,7 @@ define([ setMode: function (mode) { _isEdit = mode.isEdit; - _canAcceptChanges = mode.canReview && !mode.isReviewOnly; + _canReview = mode.canReview; }, // When our application is ready, lets get started @@ -152,6 +152,11 @@ define([ var getCollaboration = DE.getController('Collaboration'); getCollaboration.showModal(); 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) { _.delay(function () { _.each(_actionSheets, function (action) { @@ -491,11 +496,18 @@ define([ }); } - if (_canAcceptChanges && _inRevisionChange) { - menuItems.push({ - caption: me.menuReview, - event: 'review' - }); + if (_canReview) { + if (_inRevisionChange) { + menuItems.push({ + caption: me.menuReviewChange, + event: 'reviewchange' + }); + } else { + menuItems.push({ + caption: me.menuReview, + event: 'review' + }); + } } } } @@ -540,7 +552,8 @@ define([ menuReview: 'Review', menuMerge: 'Merge Cells', menuSplit: 'Split Cell', - menuDeleteTable: 'Delete Table' + menuDeleteTable: 'Delete Table', + menuReviewChange: 'Review Change' } })(), DE.Controllers.DocumentHolder || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/view/Collaboration.js b/apps/documenteditor/mobile/app/view/Collaboration.js index ed19a7e40..7dd668531 100644 --- a/apps/documenteditor/mobile/app/view/Collaboration.js +++ b/apps/documenteditor/mobile/app/view/Collaboration.js @@ -151,7 +151,7 @@ define([ textMarkup: 'Markup', textFinal: 'Final', textOriginal: 'Original', - textChange: 'Change' + textChange: 'Review Change' } })(), DE.Views.Collaboration || {})) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 7d521c1c6..436f8f198 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -31,6 +31,7 @@ "DE.Controllers.DocumentHolder.textColumns": "Columns", "DE.Controllers.DocumentHolder.textRows": "Rows", "DE.Controllers.DocumentHolder.menuDeleteTable": "Delete Table", + "DE.Controllers.DocumentHolder.menuReviewChange": "Review Change", "DE.Controllers.EditContainer.textChart": "Chart", "DE.Controllers.EditContainer.textFooter": "Footer", "DE.Controllers.EditContainer.textHeader": "Header", @@ -495,5 +496,5 @@ "DE.Views.Collaboration.textMarkup": "Markup", "DE.Views.Collaboration.textFinal": "Final", "DE.Views.Collaboration.textOriginal": "Original", - "DE.Views.Collaboration.textChange": "Change" + "DE.Views.Collaboration.textChange": "Review Change" } \ No newline at end of file