mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-15 14:02:17 +00:00
Merge branch 'rc1_FHC4_C4' into demo-cis40
This commit is contained in:
@@ -298,6 +298,7 @@ class Akte_model extends DB_Model
|
||||
$this->db->where('person_id', $person_id);
|
||||
|
||||
$this->addOrder('erstelltam', 'DESC');
|
||||
$this->addOrder('akte_id', 'DESC');
|
||||
|
||||
return $this->loadWhere([
|
||||
'archiv' => true
|
||||
|
||||
@@ -294,21 +294,13 @@ export default {
|
||||
},
|
||||
scrollToEarliestEvent() {
|
||||
const eventElements = this.$refs.scroller.querySelectorAll('.fhc-calendar-base-grid-line-event');
|
||||
let elements = [];
|
||||
|
||||
// Firefox ESR 128 Workaround ArrayIterator Reduce not available
|
||||
if (typeof eventElements.values().reduce == 'function')
|
||||
elements = eventElements.values();
|
||||
else
|
||||
elements = [...eventElements.values()];
|
||||
|
||||
const earliestEventOffset = elements
|
||||
.reduce((res, el) => {
|
||||
const top = el.offsetTop;
|
||||
if (!res[1] || top < res[0])
|
||||
return [top, el];
|
||||
return res;
|
||||
}, [0, null]);
|
||||
let earliestEventOffset = [0, null];
|
||||
for (var el of eventElements.values()) {
|
||||
const top = el.offsetTop;
|
||||
if (!earliestEventOffset[1] || top < earliestEventOffset[0])
|
||||
earliestEventOffset = [top, el];
|
||||
}
|
||||
|
||||
this.userScroll = false;
|
||||
if (earliestEventOffset[1]) {
|
||||
|
||||
Reference in New Issue
Block a user