holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar display

Browse Source 
- Make hidden indicators clickable
This commit is contained in:
Nathan Gray 2015-11-04 23:05:22 +00:00
parent 36b54a7c33
commit 08bbc433ae
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/js/app.js
View File

@ -551,7 +551,7 @@ app.classes.calendar = AppJS.extend(
}); });
// Stop browser from caching style by forcing reflow // Stop browser from caching style by forcing reflow
wrapper[0].offsetHeight; wrapper[0].offsetHeight;
wrapper.css({ wrapper.css({
"transition-duration": "", "transition-duration": "",
"transition-delay": "" "transition-delay": ""

14
calendar/js/et2_widget_daycol.js
View File

@ -456,6 +456,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
this.div.children('.hiddenEventAfter').remove(); this.div.children('.hiddenEventAfter').remove();
var timegrid = this._parent; var timegrid = this._parent;
var day = this;
// elem is jquery div of event // elem is jquery div of event
function isHidden(elem) { function isHidden(elem) {
@ -504,16 +505,23 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
if(hidden.hidden === 'top' && $j('.hiddenEventBefore',this.header).length == 0) if(hidden.hidden === 'top' && $j('.hiddenEventBefore',this.header).length == 0)
{ {
indicator = $j('<div class="hiddenEventBefore"></div>') indicator = $j('<div class="hiddenEventBefore"></div>')
.appendTo(this.header); .appendTo(this.header)
.on('click', function() {
$j('.calendar_calEvent',day.div).first()[0].scrollIntoView();
});
} }
else if(hidden.hidden === 'bottom') else if(hidden.hidden === 'bottom')
{ {
indicator = $j('.hiddenEventAfter',this.div); indicator = $j('.hiddenEventAfter',this.div);
if(indicator.length == 0) if(indicator.length == 0)
{ {
indicator = $j('<div class="hiddenEventAfter"></div>'); indicator = $j('<div class="hiddenEventAfter"></div>');
this.div.append(indicator); this.div.append(indicator)
.on('click', function() {
$j('.calendar_calEvent',day.div).last()[0].scrollIntoView(false);
// Better re-run this to clean up
day._out_of_view();
});
} }
indicator.css('top',timegrid.scrolling.height() + timegrid.scrolling.scrollTop()-indicator.height()); indicator.css('top',timegrid.scrolling.height() + timegrid.scrolling.scrollTop()-indicator.height());
} }

8
calendar/templates/default/app.css
View File

@ -263,9 +263,17 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
bottom: -7px; bottom: -7px;
border-top: none; border-top: none;
} }
.calendar_calDayColHeader .hiddenEventBefore:hover {
bottom: -11px;
border-width: 10px;
}
.calendar_calDayCol .hiddenEventAfter { .calendar_calDayCol .hiddenEventAfter {
border-bottom: none; border-bottom: none;
} }
.calendar_calDayCol .hiddenEventAfter:hover {
margin-top: -5px;
border-width: 10px;
}
.calendar_calDayColAllDay { .calendar_calDayColAllDay {