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

ListView refactoring

Browse source
This commit is contained in:
Julia Radzhabova 2020-04-09 16:29:04 +03:00
parent e0dd81e13f
commit 3e352d5c80
16 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -575,8 +575,8 @@ define([
var div_top = div.offset().top,
div_first = $(this.dataViewItems[0].el),
div_first_top = (div_first.length>0) ? div_first[0].offsetTop : 0;
if (div_top < inner_top + div_first_top || div_top+div.outerHeight() > inner_top + innerEl.height()) {
div_first_top = (div_first.length>0) ? div_first[0].clientTop : 0;
if (div_top < inner_top + div_first_top || div_top+div.outerHeight()*0.9 > inner_top + div_first_top + innerEl.height()) {
if (this.scroller && this.allowScrollbar) {
this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top - div_first_top, 0);
} else {

1
apps/common/main/resources/less/listview.less
View file

@ -1,5 +1,6 @@
.listview {
border: 1px solid @input-border;
line-height: 15px;
&.inner {
width: 100%;

4
apps/documenteditor/main/app/template/ControlSettingsDialog.template
View file

@ -83,7 +83,7 @@
</tr>
<tr style="vertical-align: top;">
<td class="padding-small">
<div id="control-settings-list" style="width:200px; height: 192px;margin-right: 10px;"></div>
<div id="control-settings-list" style="width:200px; height: 214px;margin-right: 10px;"></div>
</td>
<td class="padding-small">
<button type="button" class="btn btn-text-default" id="control-settings-btn-add" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textAdd %></button>
@ -111,7 +111,7 @@
</tr>
<tr>
<td class="padding-small">
<div id="control-settings-format" style="width: 100%; height: 165px;"></div>
<div id="control-settings-format" style="width: 100%; height: 162px;"></div>
</td>
</tr>
<tr>

2
apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -170,7 +170,7 @@
</div>
<div>
<div colspan=3 class="padding-large">
<div id="paraadv-list-tabs" style="width:348px; height: 110px;"></div>
<div id="paraadv-list-tabs" style="width:348px; height: 116px;"></div>
</div>
</div>
<div>

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

@ -51,7 +51,7 @@ define([
DE.Views.BookmarksDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 310,
height: 360,
height: 366,
buttons: null
},
@ -85,7 +85,7 @@ define([
'</tr>',
'<tr>',
'<td class="padding-small">',
'<div id="bookmarks-list" style="width:290px; height: 130px;"></div>',
'<div id="bookmarks-list" style="width:290px; height: 139px;"></div>',
'</td>',
'</tr>',
'<tr>',

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

@ -62,7 +62,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 275px;">',
'<div class="box" style="height: 272px;">',
'<div class="input-row">',
'<label style="font-weight: bold;">' + this.textLang + '</label>',
'</div>',
@ -70,7 +70,7 @@ define([
'<div class="input-row">',
'<label style="font-weight: bold;">' + this.textFormat + '</label>',
'</div>',
'<div id="datetime-dlg-format" class="" style="margin-bottom: 10px;width: 100%; height: 165px; overflow: hidden;"></div>',
'<div id="datetime-dlg-format" class="" style="margin-bottom: 10px;width: 100%; height: 162px; overflow: hidden;"></div>',
'<div class="input-row">',
'<div id="datetime-dlg-update" style="margin-top: 3px;"></div>',
'<button type="button" class="btn btn-text-default auto" id="datetime-dlg-default" style="float: right;">' + this.textDefault + '</button>',

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

@ -107,7 +107,7 @@ define([
'<label class="input-label" style="">' + me.textLevel + '</label>',
'</td></tr>',
'<tr><td>',
'<div id="tableofcontents-styles-list" class="header-styles-tableview" style="width:100%; height: 122px;"></div>',
'<div id="tableofcontents-styles-list" class="header-styles-tableview" style="width:100%; height: 121px;"></div>',
'</td></tr></table>',
'</div>',
'</td>',

2
apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -102,7 +102,7 @@
</div>
<div>
<div colspan=3 class="padding-large">
<div id="paraadv-list-tabs" style="width:348px; height: 110px;"></div>
<div id="paraadv-list-tabs" style="width:348px; height: 116px;"></div>
</div>
</div>
<div>

2
apps/presentationeditor/main/app/view/DateTimeDialog.js
View file

@ -70,7 +70,7 @@ define([
'<div class="input-row">',
'<label style="font-weight: bold;">' + this.textFormat + '</label>',
'</div>',
'<div id="datetime-dlg-format" class="" style="margin-bottom: 10px;width: 100%; height: 165px; overflow: hidden;"></div>',
'<div id="datetime-dlg-format" class="" style="margin-bottom: 10px;width: 100%; height: 162px; overflow: hidden;"></div>',
'<div class="input-row">',
'<div id="datetime-dlg-update" style="margin-top: 3px;"></div>',
'<button type="button" class="btn btn-text-default auto" id="datetime-dlg-default" style="float: right;">' + this.textDefault + '</button>',

2
apps/spreadsheeteditor/main/app/template/NameManagerDlg.template
View file

@ -20,7 +20,7 @@
</tr>
<tr>
<td colspan=2 class="padding-small">
<div id="name-manager-range-list" class="range-tableview" style="width:100%; height: 143px;"></div>
<div id="name-manager-range-list" class="range-tableview" style="width:100%; height: 141px;"></div>
</td>
</tr>
<tr>

2
apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -102,7 +102,7 @@
</div>
<div>
<div colspan=3 class="padding-large">
<div id="paraadv-list-tabs" style="width:348px; height: 110px;"></div>
<div id="paraadv-list-tabs" style="width:348px; height: 116px;"></div>
</div>
</div>
<div>

2
apps/spreadsheeteditor/main/app/template/SortDialog.template
View file

@ -20,7 +20,7 @@
</tr>
<tr>
<td class="padding-small">
<div id="sort-dialog-list" class="" style="width:100%; height: 152px;"></div>
<div id="sort-dialog-list" class="" style="width:100%; height: 151px;"></div>
</td>
</tr>
</table>

2
apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
View file

@ -53,7 +53,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
options: {
alias: 'NameManagerDlg',
contentWidth: 510,
height: 353,
height: 351,
buttons: null
},

5
apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js
View file

@ -67,14 +67,13 @@ define([
'<tr>',
'<td class="padding-small">',
'<label class="input-label">', me.textNames,'</label>',
'<div id="named-range-paste-list" class="range-tableview" style="width:100%; height: 150px;"></div>',
'<div id="named-range-paste-list" class="range-tableview" style="width:100%; height: 169px;"></div>',
'</td>',
'</tr>',
'</table>',
'</div></div>',
'</div>',
'</div>',
'<div class="separator horizontal"></div>'
'</div>'
].join('')
}, options);

4
apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js
View file

@ -62,7 +62,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 270px;">',
'<div class="box" style="height: 260px;">',
'<div style="margin-bottom: 16px;">',
'<label>' + this.textDescription + '</label>',
'</div>',
@ -72,7 +72,7 @@ define([
'<div class="input-row">',
'<label style="font-weight: bold;">' + this.textColumns + '</label>',
'</div>',
'<div id="rem-duplicates-dlg-columns" class="" style="width: 100%; height: 165px; overflow: hidden;"></div>',
'<div id="rem-duplicates-dlg-columns" class="" style="width: 100%; height: 162px; overflow: hidden;"></div>',
'</div>'
].join('');

2
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -791,7 +791,7 @@ define([
'<div class="input-row">' +
'<label><%= label %></label>' +
'</div>' +
'<div id="status-list-names" style="height: 170px;"/>' +
'<div id="status-list-names" style="height: 162px;"/>' +
'</div>',
initialize : function(options) {