Skip to content

Commit

Permalink
Merge pull request #3033 from ONLYOFFICE/fix/bugfix
Browse files Browse the repository at this point in the history
Fix/bugfix
  • Loading branch information
JuliaRadzhabova authored Jun 5, 2024
2 parents f19032a + b2f0e6f commit 7e3e481
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion apps/pdfeditor/main/app/controller/Toolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ define([

this._state.initEditing = false;
}
if (!this.mode.isPDFEdit && toolbar.isTabActive('ins'))
if (this.mode.isPDFEdit || toolbar.isTabActive('ins'))
toolbar.setTab('home');
toolbar.setVisible('ins', this.mode.isPDFEdit);
$host.find('.annotate').toggleClass('hidden', this.mode.isPDFEdit);
Expand Down
6 changes: 4 additions & 2 deletions apps/spreadsheeteditor/main/app/controller/Statusbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -597,10 +597,12 @@ define([
return;
}

var btn;
var btn,
supportBooks = me.api.asc_isSupportCopySheetsBetweenBooks();
me.copyDialog = new SSE.Views.Statusbar.CopyDialog({
title : me.statusbar.itemMoveOrCopy,
sheets : items,
supportBooks: supportBooks,
spreadsheetName: me.api.asc_getDocumentName(),
isDesktopApp: me.statusbar.mode.isDesktopApp,
handler : function(result, i, copy, workbook) {
Expand Down Expand Up @@ -642,7 +644,7 @@ define([
me.copyDialog.changeSpreadsheets(workbooks);
}
};
me.api.asc_getOpeningDocumentsList(callback);
supportBooks && me.api.asc_getOpeningDocumentsList(callback);
},

onAddWorksheetClick: function(o, index, opts) {
Expand Down
5 changes: 4 additions & 1 deletion apps/spreadsheeteditor/main/app/view/Statusbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -1112,10 +1112,12 @@ define([
},

template: '<div class="box">' +
'<% if ( supportBooks ) { %>' +
'<div class="input-row">' +
'<label><%= labelSpreadsheet %></label>' +
'</div>' +
'<div id="status-cmb-spreadsheet" style="padding-bottom: 12px;"></div>' +
'<% } %>' +
'<div class="input-row">' +
'<label><%= labelMoveBefore %></label>' +
'</div>' +
Expand All @@ -1126,7 +1128,8 @@ define([
initialize : function(options) {
_.extend(this.options, options || {}, {
labelSpreadsheet: this.textSpreadsheet,
labelMoveBefore: this.textMoveBefore
labelMoveBefore: this.textMoveBefore,
supportBooks: !!options.supportBooks
});
this.options.tpl = _.template(this.template)(this.options);

Expand Down

0 comments on commit 7e3e481

Please sign in to comment.