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

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

Browse source 
Fix/fix bugs
This commit is contained in:
Julia Radzhabova 2022-12-15 12:56:04 +03:00 committed by GitHub
parent 30f36793a2 c75ef98444
commit e98c607d4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/Search.js
View file

@ -124,7 +124,7 @@ define([
for (var l = 0; l < text.length; l++) { for (var l = 0; l < text.length; l++) {
var charCode = text.charCodeAt(l), var charCode = text.charCodeAt(l),
char = text.charAt(l); char = text.charAt(l);
if (AscCommon.IsPunctuation(charCode) !== undefined || char.trim() === '') { if (AscCommon.IsPunctuation(charCode) || char.trim() === '') {
isPunctuation = true; isPunctuation = true;
break; break;
} }

2
apps/presentationeditor/main/app/controller/Search.js
View file

@ -138,7 +138,7 @@ define([
for (var l = 0; l < text.length; l++) { for (var l = 0; l < text.length; l++) {
var charCode = text.charCodeAt(l), var charCode = text.charCodeAt(l),
char = text.charAt(l); char = text.charAt(l);
if (AscCommon.IsPunctuation(charCode) !== undefined || char.trim() === '') { if (AscCommon.IsPunctuation(charCode) || char.trim() === '') {
isPunctuation = true; isPunctuation = true;
break; break;
} }

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

@ -419,25 +419,25 @@ define([
querySavePrintSettings: function(print) { querySavePrintSettings: function(print) {
if ( this.checkMargins(this.printSettings) ) { if ( this.checkMargins(this.printSettings) ) {
var view = SSE.getController('Toolbar').getView('Toolbar');
this.savePageOptions(this.printSettings); this.savePageOptions(this.printSettings);
this._isPrint = print; this._isPrint = print;
this.printSettings.applySettings(); this.printSettings.applySettings();
if (print) {
var view = SSE.getController('Toolbar').getView('Toolbar');
var printType = this.printSettings.getRange(); var printType = this.printSettings.getRange();
this.adjPrintParams.asc_setPrintType(printType); this.adjPrintParams.asc_setPrintType(printType);
this.adjPrintParams.asc_setPageOptionsMap(this._changedProps); this.adjPrintParams.asc_setPageOptionsMap(this._changedProps);
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);
if (print) {
var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || 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);
this._isPrint = false; this._isPrint = false;
} }
Common.NotificationCenter.trigger('edit:complete', view);
} }
}, },

2
apps/spreadsheeteditor/main/app/controller/Search.js
View file

@ -446,7 +446,7 @@ define([
'<div class="sheet">' + (item[1] ? item[1] : '') + '</div>' + '<div class="sheet">' + (item[1] ? item[1] : '') + '</div>' +
'<div class="name">' + (item[2] ? item[2] : '') + '</div>' + '<div class="name">' + (item[2] ? item[2] : '') + '</div>' +
'<div class="cell">' + (item[3] ? item[3] : '') + '</div>' + '<div class="cell">' + (item[3] ? item[3] : '') + '</div>' +
'<div class="value">' + (item[4] ? item[4] : '') + '</div>' + '<div class="value">' + (item[4] ? Common.Utils.String.htmlEncode(item[4]) : '') + '</div>' +
'<div class="formula">' + (item[5] ? item[5] : '') + '</div>' + '<div class="formula">' + (item[5] ? item[5] : '') + '</div>' +
'</div>'; '</div>';
var $item = $(tr).appendTo($innerResults); var $item = $(tr).appendTo($innerResults);