Commit a2c03c3e authored by Julia Radzhabova's avatar Julia Radzhabova

Show co-authoring mode settings regardless of the license.

parent 8175061c
...@@ -283,7 +283,7 @@ define([ ...@@ -283,7 +283,7 @@ define([
this.api.SetTextBoxInputMode(parseInt(value) == 1); this.api.SetTextBoxInputMode(parseInt(value) == 1);
/** coauthoring begin **/ /** coauthoring begin **/
if (this.mode.isEdit && this.mode.canLicense && !this.mode.isOffline && this.mode.canCoAuthoring) { if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
value = Common.localStorage.getItem("de-settings-coauthmode"); value = Common.localStorage.getItem("de-settings-coauthmode");
var fast_coauth = (value===null || parseInt(value) == 1); var fast_coauth = (value===null || parseInt(value) == 1);
this.api.asc_SetFastCollaborative(fast_coauth); this.api.asc_SetFastCollaborative(fast_coauth);
......
...@@ -822,7 +822,7 @@ define([ ...@@ -822,7 +822,7 @@ define([
me.api.SetTextBoxInputMode(value!==null && parseInt(value) == 1); me.api.SetTextBoxInputMode(value!==null && parseInt(value) == 1);
/** coauthoring begin **/ /** coauthoring begin **/
if (me.appOptions.isEdit && me.appOptions.canLicense && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) { if (me.appOptions.isEdit && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) {
value = Common.localStorage.getItem("de-settings-coauthmode"); value = Common.localStorage.getItem("de-settings-coauthmode");
if (value===null && Common.localStorage.getItem("de-settings-autosave")===null && if (value===null && Common.localStorage.getItem("de-settings-autosave")===null &&
me.appOptions.customization && me.appOptions.customization.autosave===false) { me.appOptions.customization && me.appOptions.customization.autosave===false) {
...@@ -1755,7 +1755,7 @@ define([ ...@@ -1755,7 +1755,7 @@ define([
}, },
applySettings: function() { applySettings: function() {
if (this.appOptions.isEdit && this.appOptions.canLicense && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) { if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
var value = Common.localStorage.getItem("de-settings-coauthmode"), var value = Common.localStorage.getItem("de-settings-coauthmode"),
oldval = this._state.fastCoauth; oldval = this._state.fastCoauth;
this._state.fastCoauth = (value===null || parseInt(value) == 1); this._state.fastCoauth = (value===null || parseInt(value) == 1);
......
...@@ -315,7 +315,7 @@ define([ ...@@ -315,7 +315,7 @@ define([
} }
/** coauthoring begin **/ /** coauthoring begin **/
$('tr.coauth', this.el)[mode.isEdit && mode.canCoAuthoring ? 'show' : 'hide'](); $('tr.coauth', this.el)[mode.isEdit && mode.canCoAuthoring ? 'show' : 'hide']();
$('tr.coauth.changes', this.el)[mode.isEdit && mode.canLicense && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide'](); $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide']();
/** coauthoring end **/ /** coauthoring end **/
}, },
...@@ -375,7 +375,7 @@ define([ ...@@ -375,7 +375,7 @@ define([
Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue()); Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue());
/** coauthoring begin **/ /** coauthoring begin **/
Common.localStorage.setItem("de-settings-livecomment", this.chLiveComment.isChecked() ? 1 : 0); Common.localStorage.setItem("de-settings-livecomment", this.chLiveComment.isChecked() ? 1 : 0);
if (this.mode.isEdit && this.mode.canLicense && !this.mode.isOffline && this.mode.canCoAuthoring) { if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
Common.localStorage.setItem("de-settings-coauthmode", this.cmbCoAuthMode.getValue()); Common.localStorage.setItem("de-settings-coauthmode", this.cmbCoAuthMode.getValue());
Common.localStorage.setItem(this.cmbCoAuthMode.getValue() ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", this.cmbShowChanges.getValue()); Common.localStorage.setItem(this.cmbCoAuthMode.getValue() ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", this.cmbShowChanges.getValue());
} }
......
...@@ -231,7 +231,7 @@ define([ ...@@ -231,7 +231,7 @@ define([
this.api.SetTextBoxInputMode(parseInt(value) == 1); this.api.SetTextBoxInputMode(parseInt(value) == 1);
/** coauthoring begin **/ /** coauthoring begin **/
if (this.mode.isEdit && this.mode.canLicense && !this.mode.isOffline && this.mode.canCoAuthoring) { if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
value = Common.localStorage.getItem("pe-settings-coauthmode"); value = Common.localStorage.getItem("pe-settings-coauthmode");
this.api.asc_SetFastCollaborative(value===null || parseInt(value) == 1); this.api.asc_SetFastCollaborative(value===null || parseInt(value) == 1);
} }
......
...@@ -610,7 +610,7 @@ define([ ...@@ -610,7 +610,7 @@ define([
me.api.SetTextBoxInputMode(value!==null && parseInt(value) == 1); me.api.SetTextBoxInputMode(value!==null && parseInt(value) == 1);
/** coauthoring begin **/ /** coauthoring begin **/
if (me.appOptions.isEdit && me.appOptions.canLicense && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) { if (me.appOptions.isEdit && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) {
value = Common.localStorage.getItem("pe-settings-coauthmode"); value = Common.localStorage.getItem("pe-settings-coauthmode");
if (value===null && Common.localStorage.getItem("pe-settings-autosave")===null && if (value===null && Common.localStorage.getItem("pe-settings-autosave")===null &&
me.appOptions.customization && me.appOptions.customization.autosave===false) { me.appOptions.customization && me.appOptions.customization.autosave===false) {
...@@ -1510,7 +1510,7 @@ define([ ...@@ -1510,7 +1510,7 @@ define([
}, },
applySettings: function() { applySettings: function() {
if (this.appOptions.isEdit && this.appOptions.canLicense && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) { if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
var value = Common.localStorage.getItem("pe-settings-coauthmode"), var value = Common.localStorage.getItem("pe-settings-coauthmode"),
oldval = this._state.fastCoauth; oldval = this._state.fastCoauth;
this._state.fastCoauth = (value===null || parseInt(value) == 1); this._state.fastCoauth = (value===null || parseInt(value) == 1);
......
...@@ -260,7 +260,7 @@ define([ ...@@ -260,7 +260,7 @@ define([
this.lblAutosave.text(this.textAutoRecover); this.lblAutosave.text(this.textAutoRecover);
} }
/** coauthoring begin **/ /** coauthoring begin **/
$('tr.coauth.changes', this.el)[mode.isEdit && mode.canLicense && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide'](); $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide']();
/** coauthoring end **/ /** coauthoring end **/
}, },
...@@ -303,7 +303,7 @@ define([ ...@@ -303,7 +303,7 @@ define([
Common.localStorage.setItem("pe-settings-inputmode", this.chInputMode.isChecked() ? 1 : 0); Common.localStorage.setItem("pe-settings-inputmode", this.chInputMode.isChecked() ? 1 : 0);
Common.localStorage.setItem("pe-settings-zoom", this.cmbZoom.getValue()); Common.localStorage.setItem("pe-settings-zoom", this.cmbZoom.getValue());
/** coauthoring begin **/ /** coauthoring begin **/
if (this.mode.isEdit && this.mode.canLicense && !this.mode.isOffline && this.mode.canCoAuthoring) { if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
Common.localStorage.setItem("pe-settings-coauthmode", this.cmbCoAuthMode.getValue()); Common.localStorage.setItem("pe-settings-coauthmode", this.cmbCoAuthMode.getValue());
} }
/** coauthoring end **/ /** coauthoring end **/
......
...@@ -257,7 +257,7 @@ define([ ...@@ -257,7 +257,7 @@ define([
(!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments() : this.api.asc_hideComments(); (!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments() : this.api.asc_hideComments();
// this.getApplication().getController('DocumentHolder').setLiveCommenting(!(value!==null && parseInt(value) == 0)); // this.getApplication().getController('DocumentHolder').setLiveCommenting(!(value!==null && parseInt(value) == 0));
if (this.mode.isEdit && this.mode.canLicense && !this.mode.isOffline && this.mode.canCoAuthoring) { if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
value = Common.localStorage.getItem("sse-settings-coauthmode"); value = Common.localStorage.getItem("sse-settings-coauthmode");
this.api.asc_SetFastCollaborative(value===null || parseInt(value) == 1); this.api.asc_SetFastCollaborative(value===null || parseInt(value) == 1);
} }
......
...@@ -581,7 +581,7 @@ define([ ...@@ -581,7 +581,7 @@ define([
this.isLiveCommenting = !(value!==null && parseInt(value) == 0); this.isLiveCommenting = !(value!==null && parseInt(value) == 0);
this.isLiveCommenting?this.api.asc_showComments():this.api.asc_hideComments(); this.isLiveCommenting?this.api.asc_showComments():this.api.asc_hideComments();
if (this.appOptions.isEdit && this.appOptions.canLicense && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) { if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
value = Common.localStorage.getItem("sse-settings-coauthmode"); value = Common.localStorage.getItem("sse-settings-coauthmode");
if (value===null && Common.localStorage.getItem("sse-settings-autosave")===null && if (value===null && Common.localStorage.getItem("sse-settings-autosave")===null &&
this.appOptions.customization && this.appOptions.customization.autosave===false) { this.appOptions.customization && this.appOptions.customization.autosave===false) {
...@@ -1761,7 +1761,7 @@ define([ ...@@ -1761,7 +1761,7 @@ define([
}, },
applySettings: function() { applySettings: function() {
if (this.appOptions.isEdit && this.appOptions.canLicense && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) { if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
var value = Common.localStorage.getItem("sse-settings-coauthmode"), var value = Common.localStorage.getItem("sse-settings-coauthmode"),
oldval = this._state.fastCoauth; oldval = this._state.fastCoauth;
this._state.fastCoauth = (value===null || parseInt(value) == 1); this._state.fastCoauth = (value===null || parseInt(value) == 1);
......
...@@ -652,7 +652,7 @@ define([ ...@@ -652,7 +652,7 @@ define([
this.lblAutosave.text(this.textAutoRecover); this.lblAutosave.text(this.textAutoRecover);
} }
$('tr.coauth', this.el)[mode.canCoAuthoring && mode.isEdit ? 'show' : 'hide'](); $('tr.coauth', this.el)[mode.canCoAuthoring && mode.isEdit ? 'show' : 'hide']();
$('tr.coauth.changes', this.el)[mode.isEdit && mode.canLicense && !mode.isOffline && mode.canCoAuthoring? 'show' : 'hide'](); $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring? 'show' : 'hide']();
}, },
setApi: function(api) { setApi: function(api) {
...@@ -733,7 +733,7 @@ define([ ...@@ -733,7 +733,7 @@ define([
Common.localStorage.setItem("sse-settings-zoom", this.cmbZoom.getValue()); Common.localStorage.setItem("sse-settings-zoom", this.cmbZoom.getValue());
/** coauthoring begin **/ /** coauthoring begin **/
Common.localStorage.setItem("sse-settings-livecomment", this.chLiveComment.isChecked() ? 1 : 0); Common.localStorage.setItem("sse-settings-livecomment", this.chLiveComment.isChecked() ? 1 : 0);
if (this.mode.isEdit && this.mode.canLicense && !this.mode.isOffline && this.mode.canCoAuthoring) if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring)
Common.localStorage.setItem("sse-settings-coauthmode", this.cmbCoAuthMode.getValue()); Common.localStorage.setItem("sse-settings-coauthmode", this.cmbCoAuthMode.getValue());
/** coauthoring end **/ /** coauthoring end **/
Common.localStorage.setItem("sse-settings-fontrender", this.cmbFontRender.getValue()); Common.localStorage.setItem("sse-settings-fontrender", this.cmbFontRender.getValue());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment