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

Fix Bug 58113

Browse source
This commit is contained in:
Julia Radzhabova 2022-07-14 22:39:32 +03:00
parent 9f9b75f227
commit f817e0d722
8 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/Window.js
View file

@ -241,7 +241,7 @@ define([
function _autoSize() {
if (this.initConfig.height == 'auto') {
var height = parseInt(this.$window.find('> .body').css('height'));
var height = Math.ceil(parseFloat(this.$window.find('> .body').css('height')));
this.initConfig.header && (height += parseInt(this.$window.find('> .header').css('height')));
this.$window.height(height);
}

2
apps/common/main/lib/view/InsertTableDialog.js
View file

@ -48,7 +48,7 @@ define([
Common.Views.InsertTableDialog = Common.UI.Window.extend(_.extend({
options: {
width: 230,
height: 156,
height: 157,
style: 'min-width: 230px;',
cls: 'modal-dlg',
split: false,

2
apps/common/main/lib/view/ListSettingsDialog.js
View file

@ -61,7 +61,7 @@ define([
options: {
type: 0, // 0 - markers, 1 - numbers
width: 280,
height: 255,
height: 261,
style: 'min-width: 240px;',
cls: 'modal-dlg',
split: false,

18
apps/common/main/lib/view/SymbolTableDialog.js
View file

@ -430,7 +430,7 @@ define([
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td style="padding-bottom: 16px;">',
'<div id="symbol-table-scrollable-div" style="position: relative;height:'+ (this.options.height-302 + 38*(this.special ? 0 : 1)) + 'px;">',
'<div id="symbol-table-scrollable-div" style="position: relative;height:'+ (this.options.height-304 + 38*(this.special ? 0 : 1)) + 'px;">',
'<div style="width: 100%;">',
'<div id="id-preview">',
'<div>',
@ -476,7 +476,7 @@ define([
'</tr>',
'<tr>',
'<td>',
'<div id="symbol-table-special-list" class="no-borders" style="width:100%; height: '+ (this.options.height-156 + 38*(this.special ? 0 : 1)) + 'px;"></div>',
'<div id="symbol-table-special-list" class="no-borders" style="width:100%; height: '+ (this.options.height-157 + 38*(this.special ? 0 : 1)) + 'px;"></div>',
'</td>',
'</tr>',
'</table>',
@ -1104,7 +1104,7 @@ define([
},
getMaxHeight: function(){
return this.symbolTablePanel.innerHeight();
return this.symbolTablePanel.innerHeight()-2;
},
getRowsCount: function() {
@ -1436,8 +1436,8 @@ define([
this.curSize = {resize: false, width: size[0], height: size[1]};
} else if (this.curSize.resize) {
this._preventUpdateScroll = false;
this.curSize.height = size[1] - 302 + 38*(this.special ? 0 : 1);
var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
this.curSize.height = size[1] - 304 + 38*(this.special ? 0 : 1);
var rows = Math.max(1, (((this.curSize.height-2)/CELL_HEIGHT) >> 0)),
height = rows*CELL_HEIGHT;
this.symbolTablePanel.css({'height': this.curSize.height + 'px'});
@ -1447,7 +1447,7 @@ define([
this.updateView(undefined, undefined, undefined, true);
this.specialList.cmpEl.height(size[1] - 156 + 38*(this.special ? 0 : 1));
this.specialList.cmpEl.height(size[1] - 157 + 38*(this.special ? 0 : 1));
!this.special && (size[1] += 38);
var valJson = JSON.stringify(size);
@ -1465,16 +1465,16 @@ define([
this.curSize.resize = true;
this.curSize.width = size[0];
this.curSize.height = size[1] - 302 + 38*(this.special ? 0 : 1);
this.curSize.height = size[1] - 304 + 38*(this.special ? 0 : 1);
var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
var rows = Math.max(1, (((this.curSize.height-2)/CELL_HEIGHT) >> 0)),
height = rows*CELL_HEIGHT;
this.symbolTablePanel.css({'height': this.curSize.height + 'px'});
this.previewPanel.css({'height': height + 'px'});
this.previewScrolled.css({'height': height + 'px'});
this.specialList.cmpEl.height(size[1] - 156 + 38*(this.special ? 0 : 1));
this.specialList.cmpEl.height(size[1] - 157 + 38*(this.special ? 0 : 1));
this.updateView(undefined, undefined, undefined, true);
}

2
apps/documenteditor/main/app/view/CrossReferenceDialog.js
View file

@ -46,7 +46,7 @@ define([
DE.Views.CrossReferenceDialog = Common.UI.Window.extend(_.extend({
options: {
width: 400,
height: 407,
height: 410,
style: 'min-width: 240px;',
cls: 'modal-dlg',
modal: false

2
apps/documenteditor/main/app/view/LineNumbersDialog.js
View file

@ -47,7 +47,7 @@ define([
DE.Views.LineNumbersDialog = Common.UI.Window.extend(_.extend({
options: {
width: 290,
height: 320,
height: 332,
header: true,
style: 'min-width: 290px;',
cls: 'modal-dlg',

4
apps/documenteditor/main/app/view/ListSettingsDialog.js
View file

@ -55,7 +55,7 @@ define([
options: {
type: 0, // 0 - markers, 1 - numbers, 2 - multilevel
width: 300,
height: 422,
height: 424,
style: 'min-width: 240px;',
cls: 'modal-dlg',
split: false,
@ -67,7 +67,7 @@ define([
_.extend(this.options, {
title: this.txtTitle,
height: (this.type==2) ? 376 : 422,
height: (this.type==2) ? 376 : 424,
width: (this.type==2) ? 430 : 300
}, options || {});

2
apps/documenteditor/main/app/view/NotesRemoveDialog.js
View file

@ -45,7 +45,7 @@ define([
DE.Views.NotesRemoveDialog = Common.UI.Window.extend(_.extend({
options: {
width: 214,
height: 138,
height: 139,
header: true,
style: 'min-width: 214px;',
cls: 'modal-dlg',