[DE PE SSE] Fix scrolls and headers in file menu panels
This commit is contained in:
parent
33663d2bbe
commit
232e4fed76
|
@ -806,7 +806,7 @@ define([
|
||||||
updateScroller: function() {
|
updateScroller: function() {
|
||||||
if (this.scroller) {
|
if (this.scroller) {
|
||||||
Common.UI.Menu.Manager.hideAll();
|
Common.UI.Menu.Manager.hideAll();
|
||||||
var scrolled = this.$el.height()< this.pnlTable.parent().height() + 25 + this.pnlApply.height();
|
var scrolled = this.$el.height()< this.pnlTable.parent().height() + 25 + this.pnlApply.height() + this.$el.find('.header').outerHeight(true);
|
||||||
this.pnlApply.toggleClass('hidden', !scrolled);
|
this.pnlApply.toggleClass('hidden', !scrolled);
|
||||||
this.trApply.toggleClass('hidden', scrolled);
|
this.trApply.toggleClass('hidden', scrolled);
|
||||||
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
||||||
|
@ -2498,6 +2498,7 @@ define([
|
||||||
'<div id="id-print-settings" class="no-padding">',
|
'<div id="id-print-settings" class="no-padding">',
|
||||||
'<div class="print-settings">',
|
'<div class="print-settings">',
|
||||||
'<div class="flex-settings ps-container oo settings-container">',
|
'<div class="flex-settings ps-container oo settings-container">',
|
||||||
|
'<div class="main-header"><%= scope.txtPrint %></div>',
|
||||||
'<table style="width: 100%;">',
|
'<table style="width: 100%;">',
|
||||||
'<tbody>',
|
'<tbody>',
|
||||||
'<tr><td><label class="header"><%= scope.txtPrintRange %></label></td></tr>',
|
'<tr><td><label class="header"><%= scope.txtPrintRange %></label></td></tr>',
|
||||||
|
@ -2743,7 +2744,7 @@ define([
|
||||||
updateScroller: function() {
|
updateScroller: function() {
|
||||||
if (this.scroller) {
|
if (this.scroller) {
|
||||||
Common.UI.Menu.Manager.hideAll();
|
Common.UI.Menu.Manager.hideAll();
|
||||||
var scrolled = this.$el.height()< this.pnlTable.height();
|
var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.$el.find('.main-header').outerHeight(true);
|
||||||
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
||||||
this.scroller.update();
|
this.scroller.update();
|
||||||
}
|
}
|
||||||
|
|
|
@ -606,7 +606,10 @@
|
||||||
#file-menu-panel {
|
#file-menu-panel {
|
||||||
#panel-print {
|
#panel-print {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
.main-header {
|
||||||
|
font-size: 16px;
|
||||||
|
margin: 18px 0 20px 0;
|
||||||
|
}
|
||||||
#id-print-settings {
|
#id-print-settings {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width:280px;
|
width:280px;
|
||||||
|
|
|
@ -643,7 +643,7 @@ define([
|
||||||
updateScroller: function() {
|
updateScroller: function() {
|
||||||
if (this.scroller) {
|
if (this.scroller) {
|
||||||
Common.UI.Menu.Manager.hideAll();
|
Common.UI.Menu.Manager.hideAll();
|
||||||
var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height();
|
var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height() + this.$el.find('.header').outerHeight(true);
|
||||||
this.pnlApply.toggleClass('hidden', !scrolled);
|
this.pnlApply.toggleClass('hidden', !scrolled);
|
||||||
this.trApply.toggleClass('hidden', scrolled);
|
this.trApply.toggleClass('hidden', scrolled);
|
||||||
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
||||||
|
@ -1968,6 +1968,7 @@ define([
|
||||||
'<div id="id-print-settings" class="no-padding">',
|
'<div id="id-print-settings" class="no-padding">',
|
||||||
'<div class="print-settings">',
|
'<div class="print-settings">',
|
||||||
'<div class="flex-settings ps-container oo settings-container">',
|
'<div class="flex-settings ps-container oo settings-container">',
|
||||||
|
'<div class="main-header"><%= scope.txtPrint %></div>',
|
||||||
'<table style="width: 100%;">',
|
'<table style="width: 100%;">',
|
||||||
'<tbody>',
|
'<tbody>',
|
||||||
'<tr><td><label class="header"><%= scope.txtPrintRange %></label></td></tr>',
|
'<tr><td><label class="header"><%= scope.txtPrintRange %></label></td></tr>',
|
||||||
|
@ -2167,7 +2168,7 @@ define([
|
||||||
updateScroller: function() {
|
updateScroller: function() {
|
||||||
if (this.scroller) {
|
if (this.scroller) {
|
||||||
Common.UI.Menu.Manager.hideAll();
|
Common.UI.Menu.Manager.hideAll();
|
||||||
var scrolled = this.$el.height()< this.pnlTable.height();
|
var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.$el.find('.main-header').outerHeight(true);
|
||||||
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
||||||
this.scroller.update();
|
this.scroller.update();
|
||||||
}
|
}
|
||||||
|
|
|
@ -586,6 +586,10 @@
|
||||||
|
|
||||||
#panel-print {
|
#panel-print {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
.main-header {
|
||||||
|
font-size: 16px;
|
||||||
|
margin: 18px 0 20px 0;
|
||||||
|
}
|
||||||
#print-preview-empty {
|
#print-preview-empty {
|
||||||
padding: 14px;
|
padding: 14px;
|
||||||
color: @text-tertiary-ie;
|
color: @text-tertiary-ie;
|
||||||
|
|
|
@ -831,7 +831,7 @@ define([
|
||||||
updateScroller: function() {
|
updateScroller: function() {
|
||||||
if (this.scroller) {
|
if (this.scroller) {
|
||||||
Common.UI.Menu.Manager.hideAll();
|
Common.UI.Menu.Manager.hideAll();
|
||||||
var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height();
|
var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height() + this.$el.find('.header').outerHeight(true);
|
||||||
this.pnlApply.toggleClass('hidden', !scrolled);
|
this.pnlApply.toggleClass('hidden', !scrolled);
|
||||||
this.trApply.toggleClass('hidden', scrolled);
|
this.trApply.toggleClass('hidden', scrolled);
|
||||||
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
||||||
|
@ -2764,13 +2764,6 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
this.btnsSavePDF = [];
|
|
||||||
for (var i=0; i<2; i++) {
|
|
||||||
this.btnsSavePDF.push(new Common.UI.Button({
|
|
||||||
el: $markup.findById('#print-btn-save-pdf-'+i)
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
this.btnPrevPage = new Common.UI.Button({
|
this.btnPrevPage = new Common.UI.Button({
|
||||||
parentEl: $markup.findById('#print-prev-page'),
|
parentEl: $markup.findById('#print-prev-page'),
|
||||||
cls: 'btn-prev-page',
|
cls: 'btn-prev-page',
|
||||||
|
@ -2856,7 +2849,7 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
|
||||||
updateScroller: function() {
|
updateScroller: function() {
|
||||||
if (this.scroller) {
|
if (this.scroller) {
|
||||||
Common.UI.Menu.Manager.hideAll();
|
Common.UI.Menu.Manager.hideAll();
|
||||||
var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height();
|
var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height() + this.$el.find('.main-header').outerHeight(true);
|
||||||
this.pnlApply.toggleClass('hidden', !scrolled);
|
this.pnlApply.toggleClass('hidden', !scrolled);
|
||||||
this.trApply.toggleClass('hidden', scrolled);
|
this.trApply.toggleClass('hidden', scrolled);
|
||||||
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
|
||||||
|
|
Loading…
Reference in a new issue