Skip to content

Commit

Permalink
Merge pull request 'Fix Bug 72453' (#220) from fix/bugfix into releas…
Browse files Browse the repository at this point in the history
…e/v8.3.0
  • Loading branch information
Julia Radzhabova committed Jan 13, 2025
2 parents 2723b2d + b3d32a3 commit b81516a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
6 changes: 4 additions & 2 deletions apps/common/main/lib/component/Window.js
Original file line number Diff line number Diff line change
Expand Up @@ -514,11 +514,13 @@ define([

if (!options.dontshow) body.css('padding-bottom', '10px');

if (options.maxwidth && options.width=='auto') {
if ((options.maxwidth || options.minwidth) && options.width=='auto') {
var width = !Common.UI.isRTL() ? (Common.Utils.getPosition(text).left + text.width() + parseInt(text_cnt.css('padding-right'))) :
(parseInt(text_cnt.css('padding-right')) + icon_width + text.width() + parseInt(text_cnt.css('padding-left')));
if (width > options.maxwidth)
if (options.maxwidth && width > options.maxwidth)
options.width = options.maxwidth;
else if (options.minwidth && width < options.minwidth)
options.width = options.minwidth;
}
if (options.width=='auto') {
text_cnt.height(Math.max(text.height(), icon_height) + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0));
Expand Down
1 change: 1 addition & 0 deletions apps/documenteditor/main/app/controller/Links.js
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ define([
msg: this.view.confirmReplaceTOF,
buttons: ['yes', 'no', 'cancel'],
primary: 'yes',
minwidth: 320,
callback: _.bind(function(btn) {
if (btn=='yes' || btn=='no') {
apiCallback && apiCallback(btn === 'yes');
Expand Down

0 comments on commit b81516a

Please sign in to comment.