Commit b5510030 authored by Julia Radzhabova's avatar Julia Radzhabova Committed by GitHub

Merge pull request #77 from ONLYOFFICE/hotfix/v4.3.5

Hotfix/v4.3.5
parents 80025b35 fc82df5e
......@@ -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 = _config.document.permissions.review = false;
_config.editorConfig.canUseHistory = false;
}
if (!_config.document.title || _config.document.title=='')
......
......@@ -383,12 +383,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) {
......@@ -399,6 +398,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});
......
......@@ -182,6 +182,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);
......@@ -197,9 +199,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) {
......@@ -214,6 +217,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)
......@@ -296,11 +300,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() {
......
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