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

Merge branch 'hotfix/v4.3.5'

Browse source
This commit is contained in:
Alexey Golubev 2017-06-05 16:51:25 +03:00
parent 444e463c9f c7a8f9efb8
commit 93d1e58820
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/api/documents/api.js
View file

@ -115,7 +115,8 @@
statusBar: true,
autosave: true,
forcesave: false,
commentAuthorOnly: false
commentAuthorOnly: false,
showReviewChanges: false
},
plugins: {
autoStartGuid: 'asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}',
@ -328,6 +329,7 @@
if (!_config.document.permissions)
_config.document.permissions = {};
_config.document.permissions.edit = false;
_config.editorConfig.canUseHistory = false;
}
if (!_config.document.title || _config.document.title=='')

7
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -382,12 +382,11 @@ define([
}
$(this.el).find('ul').scrollTop(0);
this.trigger('show:after', this, e);
this.flushVisibleFontsTiles();
this.updateVisibleFontsTiles(null, 0);
} else {
Common.UI.ComboBox.prototype.onAfterShowMenu.apply(this, arguments);
}
this.flushVisibleFontsTiles();
this.updateVisibleFontsTiles(null, 0);
},
onAfterHideMenu: function(e) {
@ -398,6 +397,8 @@ define([
},
addItemToRecent: function(record) {
if (this.recent<1) return;
if (record.get('type') != FONT_TYPE_RECENT &&
!this.store.findWhere({name: record.get('name'),type:FONT_TYPE_RECENT})) {
var fonts = this.store.where({type:FONT_TYPE_RECENT});

12
apps/documenteditor/main/app/controller/Statusbar.js
View file

@ -184,6 +184,8 @@ define([
value = Common.localStorage.getItem("de-new-changes");
this.showNewChangesTip = !(value && parseInt(value) == 1) && !this.statusbar.mode.isLightVersion;
var showChangesPanel = (typeof (this.statusbar.mode.customization) == 'object' && !!this.statusbar.mode.customization.showReviewChanges);
if (this.statusbar.mode.isReviewOnly) {
var iconEl = $('.btn-icon', this.statusbar.btnReview.cmpEl);
(this.api.asc_HaveRevisionsChanges()) ? iconEl.removeClass(this.statusbar.btnReviewCls).addClass('btn-ic-changes') : iconEl.removeClass('btn-ic-changes').addClass(this.statusbar.btnReviewCls);
@ -199,9 +201,10 @@ define([
} else {
value = Common.localStorage.getItem("de-track-changes");
var doc_review = this.api.asc_IsTrackRevisions();
if (!doc_review)
if (!doc_review) {
this.changeReviewStatus(false);
else {
this.statusbar.mnuChangesPanel.setChecked(showChangesPanel);
} else {
var iconEl = $('.btn-icon', this.statusbar.btnReview.cmpEl);
(this.api.asc_HaveRevisionsChanges()) ? iconEl.removeClass(this.statusbar.btnReviewCls).addClass('btn-ic-changes') : iconEl.removeClass('btn-ic-changes').addClass(this.statusbar.btnReviewCls);
if (value!==null && parseInt(value) == 1) {
@ -216,6 +219,7 @@ define([
this.statusbar.btnReview.updateHint(this.statusbar.tipReview);
} else {
this.changeReviewStatus(false);
this.statusbar.mnuChangesPanel.setChecked(showChangesPanel);
if (this.api.asc_HaveRevisionsChanges() && this.showNewChangesTip && !statusbarIsHidden){
this.statusbar.btnReview.updateHint('');
if (this.newChangesTooltip===undefined)
@ -298,11 +302,11 @@ define([
if (this.api) {
this.api.asc_SetTrackRevisions(state);
}
this.showHideReviewChangesPanel(state && !this.statusbar.mode.isLightVersion);
this.showHideReviewChangesPanel(state);
},
showHideReviewChangesPanel: function(state) {
this.reviewChangesPanel[state ? 'show' : 'hide']();
this.reviewChangesPanel[(state && !this.statusbar.mode.isLightVersion) ? 'show' : 'hide']();
},
synchronizeChanges: function() {