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

Merge pull request #1704 from ONLYOFFICE/fix/fix-bugs

Browse source 
Fix/fix bugs
This commit is contained in:
Julia Radzhabova 2022-04-18 13:33:21 +03:00 committed by GitHub
parent 4e521b0bc6 c76fe90d8e
commit 5b6d93913c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/common/main/lib/component/DataView.js
View file

@ -1650,7 +1650,18 @@ define([
if (recents.length > 0 && diff) { if (recents.length > 0 && diff) {
me.recentShapes = recents; me.recentShapes = recents;
me.groups[0].groupStore.reset(me.recentShapes); var resentsStore = new Common.UI.DataViewStore();
_.each(me.recentShapes, function (recent) {
var model = {
data: {shapeType: recent.data.shapeType},
tip: recent.tip,
allowSelected: recent.allowSelected,
selected: recent.selected,
groupName: recent.groupName
};
resentsStore.push(model);
});
me.groups[0].groupStore = resentsStore;
var store = new Common.UI.DataViewStore(); var store = new Common.UI.DataViewStore();
_.each(me.groups, function (group) { _.each(me.groups, function (group) {

6
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -326,7 +326,7 @@ define([
this.fillPrintOptions(this.adjPrintParams, false); this.fillPrintOptions(this.adjPrintParams, false);
var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
opts.asc_setAdvancedOptions(this.adjPrintParams); opts.asc_setAdvancedOptions(this.adjPrintParams);
var pageCount = this.api.asc_initPrintPreview('print-preview', opts); var pageCount = this.api.asc_initPrintPreview('print-preview', opts);
@ -412,7 +412,7 @@ define([
this.adjPrintParams.asc_setIgnorePrintArea(this.printSettings.getIgnorePrintArea()); this.adjPrintParams.asc_setIgnorePrintArea(this.printSettings.getIgnorePrintArea());
Common.localStorage.setItem("sse-print-settings-range", printType); Common.localStorage.setItem("sse-print-settings-range", printType);
var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
opts.asc_setAdvancedOptions(this.adjPrintParams); opts.asc_setAdvancedOptions(this.adjPrintParams);
this.api.asc_Print(opts); this.api.asc_Print(opts);
Common.NotificationCenter.trigger('edit:complete', view); Common.NotificationCenter.trigger('edit:complete', view);
@ -717,7 +717,7 @@ define([
adjPrintParams.asc_setPageOptionsMap(this._changedProps); adjPrintParams.asc_setPageOptionsMap(this._changedProps);
adjPrintParams.asc_setIgnorePrintArea(this.printSettings.getIgnorePrintArea()); adjPrintParams.asc_setIgnorePrintArea(this.printSettings.getIgnorePrintArea());
var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
opts.asc_setAdvancedOptions(adjPrintParams); opts.asc_setAdvancedOptions(adjPrintParams);
var pageCount = this.api.asc_updatePrintPreview(opts); var pageCount = this.api.asc_updatePrintPreview(opts);