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

Merge pull request #1575 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-02-16 23:06:38 +03:00 committed by GitHub
parent f65ac90534 116e364efb
commit 47f847d3c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -373,17 +373,21 @@ define([
} else if (format == Asc.c_oAscFileType.PDF || format == Asc.c_oAscFileType.PDFA)
this._saveAsFormat(menu, format, ext);
else {
Common.UI.warning({
width: 600,
title: this.notcriticalErrorTitle,
msg: Common.Utils.String.format(this.warnDownloadAsPdf, fileType.toUpperCase()),
buttons: ['ok', 'cancel'],
callback: _.bind(function(btn){
if (btn == 'ok') {
me._saveAsFormat(menu, format, ext, new AscCommon.asc_CTextParams(Asc.c_oAscTextAssociation.PlainLine));
}
}, this)
});
if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) // don't show message about pdf/xps/oxps
me._saveAsFormat(menu, format, ext, new AscCommon.asc_CTextParams(Asc.c_oAscTextAssociation.PlainLine));
else {
Common.UI.warning({
width: 600,
title: this.notcriticalErrorTitle,
msg: Common.Utils.String.format(this.warnDownloadAsPdf, fileType.toUpperCase()),
buttons: ['ok', 'cancel'],
callback: _.bind(function(btn){
if (btn == 'ok') {
me._saveAsFormat(menu, format, ext, new AscCommon.asc_CTextParams(Asc.c_oAscTextAssociation.PlainLine));
}
}, this)
});
}
}
} else
this._saveAsFormat(menu, format, ext);

21
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -1341,18 +1341,17 @@ define([
if (!value) {
value = this._getApiTextSize();
Common.UI.warning({
msg: this.textFontSizeErr,
callback: function() {
_.defer(function(btn) {
$('input', combo.cmpEl).focus();
})
}
});
setTimeout(function(){
Common.UI.warning({
msg: me.textFontSizeErr,
callback: function() {
_.defer(function(btn) {
$('input', combo.cmpEl).focus();
})
}
});
}, 1);
combo.setRawValue(value);
e.preventDefault();
return false;
}

21
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -1324,18 +1324,17 @@ define([
if (!value) {
value = this._getApiTextSize();
Common.UI.warning({
msg: this.textFontSizeErr,
callback: function() {
_.defer(function(btn) {
$('input', combo.cmpEl).focus();
})
}
});
setTimeout(function(){
Common.UI.warning({
msg: me.textFontSizeErr,
callback: function() {
_.defer(function(btn) {
$('input', combo.cmpEl).focus();
})
}
});
}, 1);
combo.setRawValue(value);
e.preventDefault();
return false;
}

21
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1625,18 +1625,17 @@ define([
if (!value) {
value = this._getApiTextSize();
Common.UI.warning({
msg: this.textFontSizeErr,
callback: function() {
_.defer(function(btn) {
$('input', combo.cmpEl).focus();
})
}
});
setTimeout(function(){
Common.UI.warning({
msg: me.textFontSizeErr,
callback: function() {
_.defer(function(btn) {
$('input', combo.cmpEl).focus();
})
}
});
}, 1);
combo.setRawValue(value);
e.preventDefault();
return false;
}