Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Datepicker: scroll into view

Browse source 
fixes #1021
This commit is contained in:
Felix Niklas 2018-01-03 16:26:57 +01:00
parent 24bfb7d5bf
commit 93c7ffbfdb
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/app/lib/bootstrap/bootstrap-datepicker.js vendored
View file

@ -26,6 +26,7 @@
- allow custom template as options parameter - allow custom template as options parameter
- fix that place method doesn't think that the container is the window, but rather the real window is the window - fix that place method doesn't think that the container is the window, but rather the real window is the window
- added rerender method to show correct today if task is longer open the 24 hours - added rerender method to show correct today if task is longer open the 24 hours
- scroll into view
*/ */
(function(factory){ (function(factory){
@ -757,6 +758,16 @@
zIndex: zIndex zIndex: zIndex
}); });
} }
// adjust scroll of scrollParent
var scrollParent = this.picker.scrollParent();
var bottomEdge = offset.top + height + this.picker.outerHeight();
var scrollBottomEdge = scrollParent.scrollTop() + scrollParent.height();
if(bottomEdge > scrollBottomEdge){
scrollParent.scrollTop(scrollParent.scrollTop() + (bottomEdge - scrollBottomEdge) + 10);
}
return this; return this;
}, },

1
app/assets/stylesheets/zammad.scss
View file

@ -3843,6 +3843,7 @@ footer {
} }
.sidebar { .sidebar {
position: relative;
width: 280px; width: 280px;
padding: 20px; padding: 20px;
color: hsl(60,1%,34%); color: hsl(60,1%,34%);