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

Set application prefix for Collaboration tab (used for saving to local storage).

Browse source
This commit is contained in:
Julia Radzhabova 2017-10-12 12:05:55 +03:00
parent 9217de510c
commit 1057868cda
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -488,7 +488,7 @@ define([
state = (state == 'on'); state = (state == 'on');
this.api.asc_SetTrackRevisions(state); this.api.asc_SetTrackRevisions(state);
Common.localStorage.setItem("de-track-changes", state ? 1 : 0); Common.localStorage.setItem(this.view.appPrefix + "track-changes", state ? 1 : 0);
this.view.turnChanges(state); this.view.turnChanges(state);
} }
@ -498,7 +498,7 @@ define([
state = (state == 'on'); state = (state == 'on');
this.view.turnSpelling(state); this.view.turnSpelling(state);
Common.localStorage.setItem("de-settings-spellcheck", state ? 1 : 0); Common.localStorage.setItem(this.view.appPrefix + "settings-spellcheck", state ? 1 : 0);
this.api.asc_setSpellCheck(state); this.api.asc_setSpellCheck(state);
}, },
@ -521,24 +521,24 @@ define([
}, },
onCoAuthMode: function(menu, item, e) { onCoAuthMode: function(menu, item, e) {
Common.localStorage.setItem("de-settings-coauthmode", item.value); Common.localStorage.setItem(this.view.appPrefix + "settings-coauthmode", item.value);
if (this.api) { if (this.api) {
this.api.asc_SetFastCollaborative(item.value==1); this.api.asc_SetFastCollaborative(item.value==1);
var value = Common.localStorage.getItem(item.value ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict"); var value = Common.localStorage.getItem(item.value ? this.view.appPrefix + "settings-showchanges-fast" : this.view.appPrefix + "settings-showchanges-strict");
if (value !== null) if (value !== null)
this.api.SetCollaborativeMarksShowType(value == 'all' ? Asc.c_oAscCollaborativeMarksShowType.All : this.api.SetCollaborativeMarksShowType(value == 'all' ? Asc.c_oAscCollaborativeMarksShowType.All :
value == 'none' ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges); value == 'none' ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges);
else else
this.api.SetCollaborativeMarksShowType(item.value ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges); this.api.SetCollaborativeMarksShowType(item.value ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges);
value = Common.localStorage.getItem("de-settings-autosave"); value = Common.localStorage.getItem(this.view.appPrefix + "settings-autosave");
if (value===null && this.appConfig.customization && this.appConfig.customization.autosave===false) if (value===null && this.appConfig.customization && this.appConfig.customization.autosave===false)
value = 0; value = 0;
value = (!item.value && value!==null) ? parseInt(value) : 1; value = (!item.value && value!==null) ? parseInt(value) : 1;
Common.localStorage.setItem("de-settings-autosave", value); Common.localStorage.setItem(this.view.appPrefix + "settings-autosave", value);
this.api.asc_setAutoSaveGap(value); this.api.asc_setAutoSaveGap(value);
} }
Common.NotificationCenter.trigger('edit:complete', this.view); Common.NotificationCenter.trigger('edit:complete', this.view);
@ -581,7 +581,7 @@ define([
onAppReady: function (config) { onAppReady: function (config) {
var me = this; var me = this;
if ( me.view && Common.localStorage.getBool("de-settings-spellcheck", true) ) if ( me.view && Common.localStorage.getBool(me.view.appPrefix + "settings-spellcheck", true) )
me.view.turnSpelling(true); me.view.turnSpelling(true);
if ( config.canReview ) { if ( config.canReview ) {
@ -602,7 +602,7 @@ define([
_setReviewStatus(false); _setReviewStatus(false);
} else { } else {
me.api.asc_HaveRevisionsChanges() && me.view.markChanges(true); me.api.asc_HaveRevisionsChanges() && me.view.markChanges(true);
_setReviewStatus(Common.localStorage.getBool("de-track-changes")); _setReviewStatus(Common.localStorage.getBool(me.view.appPrefix + "track-changes"));
} }
if ( typeof (me.appConfig.customization) == 'object' && (me.appConfig.customization.showReviewChanges==true) ) { if ( typeof (me.appConfig.customization) == 'object' && (me.appConfig.customization.showReviewChanges==true) ) {
@ -627,8 +627,8 @@ define([
}, },
applySettings: function(menu) { applySettings: function(menu) {
this.view && this.view.turnSpelling( Common.localStorage.getBool("de-settings-spellcheck", true) ); this.view && this.view.turnSpelling( Common.localStorage.getBool(this.view.appPrefix + "settings-spellcheck", true) );
this.view && this.view.turnCoAuthMode( Common.localStorage.getBool("de-settings-coauthmode", true) ); this.view && this.view.turnCoAuthMode( Common.localStorage.getBool(this.view.appPrefix + "settings-coauthmode", true) );
}, },
synchronizeChanges: function() { synchronizeChanges: function() {

3
apps/common/main/lib/util/LocalStorage.js
View file

@ -125,6 +125,9 @@ define(['gateway'], function () {
setKeysFilter: function(value) { setKeysFilter: function(value) {
_filter = value; _filter = value;
}, },
getKeysFilter: function() {
return _filter;
},
itemExists: _getItemExists, itemExists: _getItemExists,
sync: _refresh, sync: _refresh,
save: _save save: _save

7
apps/common/main/lib/view/ReviewChanges.js
View file

@ -609,6 +609,9 @@ define([
}); });
} }
var filter = Common.localStorage.getKeysFilter();
this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
}, },
@ -721,8 +724,8 @@ define([
})); }));
me.btnCoAuthMode.updateHint(me.tipCoAuthMode); me.btnCoAuthMode.updateHint(me.tipCoAuthMode);
var value = Common.localStorage.getItem("de-settings-coauthmode"); var value = Common.localStorage.getItem(me.appPrefix + "settings-coauthmode");
if (value===null && !Common.localStorage.itemExists("de-settings-autosave") && if (value===null && !Common.localStorage.itemExists(me.appPrefix + "settings-autosave") &&
config.customization && config.customization.autosave===false) { config.customization && config.customization.autosave===false) {
value = 0; // use customization.autosave only when de-settings-coauthmode and de-settings-autosave are null value = 0; // use customization.autosave only when de-settings-coauthmode and de-settings-autosave are null
} }