<%= scope.textOriginal %>
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 2538460a4..6f44e1424 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -776,6 +776,7 @@ define([
this.menu = options.menu;
this.coreProps = null;
this.authors = [];
+ this._locked = false;
},
render: function() {
@@ -1009,7 +1010,9 @@ define([
me.trAuthor.before(div);
me.authors.push(item);
});
+ this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit);
}
+ this.SetDisabled();
},
_ShowHideInfoItem: function(el, visible) {
@@ -1048,6 +1051,10 @@ define([
},
setMode: function(mode) {
+ this.mode = mode;
+ this.inputAuthor.setVisible(mode.isEdit);
+ this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
+ this.SetDisabled();
return this;
},
@@ -1095,12 +1102,18 @@ define([
},
onLockCore: function(lock) {
- this.inputTitle.setDisabled(lock);
- this.inputSubject.setDisabled(lock);
- this.inputComment.setDisabled(lock);
- this.inputAuthor.setDisabled(lock);
- this.tblAuthor.find('.close').toggleClass('disabled', lock);
- !lock && this.updateFileInfo();
+ this._locked = lock;
+ this.updateFileInfo();
+ },
+
+ SetDisabled: function() {
+ var disable = !this.mode.isEdit || this._locked;
+ this.inputTitle.setDisabled(disable);
+ this.inputSubject.setDisabled(disable);
+ this.inputComment.setDisabled(disable);
+ this.inputAuthor.setDisabled(disable);
+ this.tblAuthor.find('.close').toggleClass('disabled', this._locked);
+ this.tblAuthor.toggleClass('disabled', disable);
},
txtPlacement: 'Location',
diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js
index deecc10f8..46060e89c 100644
--- a/apps/documenteditor/mobile/app/controller/Main.js
+++ b/apps/documenteditor/mobile/app/controller/Main.js
@@ -604,6 +604,19 @@ define([
me.applyLicense();
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
+
+ if (!me.appOptions.canReview) {
+ var canViewReview = me.appOptions.isEdit || me.api.asc_HaveRevisionsChanges(true);
+ DE.getController('Common.Controllers.Collaboration').setCanViewReview(canViewReview);
+ if (canViewReview) {
+ var viewReviewMode = Common.localStorage.getItem("de-view-review-mode");
+ if (viewReviewMode===null)
+ viewReviewMode = me.appOptions.customization && /^(original|final|markup)$/i.test(me.appOptions.customization.reviewDisplay) ? me.appOptions.customization.reviewDisplay.toLocaleLowerCase() : 'original';
+ viewReviewMode = me.appOptions.isEdit ? 'markup' : viewReviewMode;
+ DE.getController('Common.Controllers.Collaboration').turnDisplayMode(viewReviewMode);
+ }
+ }
+
Common.Gateway.documentReady();
},
diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js
index 8269cbea5..4e1eb3f7e 100644
--- a/apps/documenteditor/mobile/app/controller/Settings.js
+++ b/apps/documenteditor/mobile/app/controller/Settings.js
@@ -262,7 +262,7 @@ define([
$('#settings-print').single('click', _.bind(me.onPrint, me));
$('#settings-collaboration').single('click', _.bind(me.clickCollaboration, me));
var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode();
- if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
+ if(_stateDisplayMode == "final" || _stateDisplayMode == "original") {
$('#settings-document').addClass('disabled');
}
var _userCount = DE.getController('Main').returnUserCount();
@@ -378,7 +378,7 @@ define([
value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();
$unitMeasurement.val([value]);
var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode();
- if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
+ if(_stateDisplayMode == "final" || _stateDisplayMode == "original") {
$('#settings-no-characters').addClass('disabled');
$('#settings-hidden-borders').addClass('disabled');
}
diff --git a/apps/documenteditor/mobile/app/controller/Toolbar.js b/apps/documenteditor/mobile/app/controller/Toolbar.js
index ccd784064..d5ed2de7f 100644
--- a/apps/documenteditor/mobile/app/controller/Toolbar.js
+++ b/apps/documenteditor/mobile/app/controller/Toolbar.js
@@ -153,7 +153,7 @@ define([
},
setDisplayMode: function(displayMode) {
- stateDisplayMode = displayMode == "Final" || displayMode == "Original" ? true : false;
+ stateDisplayMode = displayMode == "final" || displayMode == "original" ? true : false;
var selected = this.api.getSelectedElements();
this.onApiFocusObject(selected);
},
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index af9828b86..656ce32e7 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -660,6 +660,7 @@ define([
this.menu = options.menu;
this.coreProps = null;
this.authors = [];
+ this._locked = false;
},
render: function() {
@@ -882,7 +883,9 @@ define([
me.trAuthor.before(div);
me.authors.push(item);
});
+ this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit);
}
+ this.SetDisabled();
},
_ShowHideInfoItem: function(el, visible) {
@@ -897,6 +900,10 @@ define([
},
setMode: function(mode) {
+ this.mode = mode;
+ this.inputAuthor.setVisible(mode.isEdit);
+ this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
+ this.SetDisabled();
return this;
},
@@ -908,12 +915,18 @@ define([
},
onLockCore: function(lock) {
- this.inputTitle.setDisabled(lock);
- this.inputSubject.setDisabled(lock);
- this.inputComment.setDisabled(lock);
- this.inputAuthor.setDisabled(lock);
- this.tblAuthor.find('.close').toggleClass('disabled', lock);
- !lock && this.updateFileInfo();
+ this._locked = lock;
+ this.updateFileInfo();
+ },
+
+ SetDisabled: function() {
+ var disable = !this.mode.isEdit || this._locked;
+ this.inputTitle.setDisabled(disable);
+ this.inputSubject.setDisabled(disable);
+ this.inputComment.setDisabled(disable);
+ this.inputAuthor.setDisabled(disable);
+ this.tblAuthor.find('.close').toggleClass('disabled', this._locked);
+ this.tblAuthor.toggleClass('disabled', disable);
},
txtPlacement: 'Location',
diff --git a/apps/spreadsheeteditor/main/app/controller/DataTab.js b/apps/spreadsheeteditor/main/app/controller/DataTab.js
index ba3d9c8de..fbf16ba4a 100644
--- a/apps/spreadsheeteditor/main/app/controller/DataTab.js
+++ b/apps/spreadsheeteditor/main/app/controller/DataTab.js
@@ -56,18 +56,6 @@ define([
sdkViewName : '#id_main',
initialize: function () {
-
- this.addListeners({
- 'DataTab': {
- 'data:group': this.onGroup,
- 'data:ungroup': this.onUngroup,
- 'data:tocolumns': this.onTextToColumn,
- 'data:show': this.onShowClick,
- 'data:hide': this.onHideClick,
- 'data:groupsettings': this.onGroupSettings
- }
- });
-
this._state = {
CSVOptions: new Asc.asc_CTextOptions(0, 4, '')
};
@@ -91,6 +79,19 @@ define([
this.view = this.createView('DataTab', {
toolbar: this.toolbar.toolbar
});
+ this.addListeners({
+ 'DataTab': {
+ 'data:group': this.onGroup,
+ 'data:ungroup': this.onUngroup,
+ 'data:tocolumns': this.onTextToColumn,
+ 'data:show': this.onShowClick,
+ 'data:hide': this.onHideClick,
+ 'data:groupsettings': this.onGroupSettings
+ },
+ 'Statusbar': {
+ 'sheet:changed': this.onApiSheetChanged
+ }
+ });
},
SetDisabled: function(state) {
@@ -217,6 +218,13 @@ define([
}
},
+ onApiSheetChanged: function() {
+ if (!this.toolbar.mode || !this.toolbar.mode.isEdit || this.toolbar.mode.isEditDiagram || this.toolbar.mode.isEditMailMerge) return;
+
+ var currentSheet = this.api.asc_getActiveWorksheetIndex();
+ this.onWorksheetLocked(currentSheet, this.api.asc_isWorksheetLockedOrDeleted(currentSheet));
+ },
+
textWizard: 'Text to Columns Wizard'
}, SSE.Controllers.DataTab || {}));
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 69f1b40bc..531603031 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -1109,6 +1109,7 @@ define([
this.menu = options.menu;
this.coreProps = null;
this.authors = [];
+ this._locked = false;
},
render: function() {
@@ -1331,7 +1332,9 @@ define([
me.trAuthor.before(div);
me.authors.push(item);
});
+ this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit);
}
+ this.SetDisabled();
},
_ShowHideInfoItem: function(el, visible) {
@@ -1346,6 +1349,10 @@ define([
},
setMode: function(mode) {
+ this.mode = mode;
+ this.inputAuthor.setVisible(mode.isEdit);
+ this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
+ this.SetDisabled();
return this;
},
@@ -1357,12 +1364,18 @@ define([
},
onLockCore: function(lock) {
- this.inputTitle.setDisabled(lock);
- this.inputSubject.setDisabled(lock);
- this.inputComment.setDisabled(lock);
- this.inputAuthor.setDisabled(lock);
- this.tblAuthor.find('.close').toggleClass('disabled', lock);
- !lock && this.updateFileInfo();
+ this._locked = lock;
+ this.updateFileInfo();
+ },
+
+ SetDisabled: function() {
+ var disable = !this.mode.isEdit || this._locked;
+ this.inputTitle.setDisabled(disable);
+ this.inputSubject.setDisabled(disable);
+ this.inputComment.setDisabled(disable);
+ this.inputAuthor.setDisabled(disable);
+ this.tblAuthor.find('.close').toggleClass('disabled', this._locked);
+ this.tblAuthor.toggleClass('disabled', disable);
},
txtPlacement: 'Location',