extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Disable scrolling to change week (swipe & pg up/ pg dn kept)

Browse Source 
- Remove animations
This commit is contained in:
Nathan Gray 2016-02-04 21:05:31 +00:00
parent db7528b249
commit c4f125a772
6 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/js/app.js
View File

@ -650,7 +650,8 @@ app.classes.calendar = AppJS.extend(
},this, et2_calendar_timegrid);
if(widget == null) return;
}
/* Disabled
*
// We clone the nodes so we can animate the transition
var original = $j(widget.getDOMNode()).closest('.et2_grid');
var cloned = original.clone(true).attr("id","CLONE");
@ -756,7 +757,13 @@ app.classes.calendar = AppJS.extend(
}
// If detecting the transition end worked, we wouldn't need to use a timeout.
window.setTimeout(remove,100);
*/
window.setTimeout(function() {
if(app.calendar)
{
app.calendar._scroll_disabled = false;
}
}, 2000);
// Get the view to calculate - this actually loads the new data
// Using a timeout make it a little faster (in Chrome)
window.setTimeout(function() {
@ -777,6 +784,7 @@ app.classes.calendar = AppJS.extend(
};
// Bind only once, to the whole thing
/* Disabled
jQuery('body').off('.calendar')
//.on('wheel','.et2_container:#calendar-list,#calendar-sidebox)',
.on('wheel.calendar','.et2_container .calendar_calTimeGrid, .et2_container .calendar_plannerWidget',
@ -806,6 +814,7 @@ app.classes.calendar = AppJS.extend(
return false;
}
);
*/
if(framework.applications.calendar && framework.applications.calendar.tab)
{
jQuery(framework.applications.calendar.tab.contentDiv).swipe('destroy')

24
calendar/js/et2_widget_daycol.js
View File

@ -393,31 +393,19 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
this.title.toggleClass('et2_clickable et2_link',label === '');
},
set_left: function(left) {
// Maybe?
window.setTimeout(jQuery.proxy(function() {
if(this.div)
{
this.div.css('left',left);
// Headers are positioned relative
//this.header.css('left',left);
}
},this),1);
},
set_width: function(width) {
if(this.width_timeout)
{
window.clearTimeout(this.width_timeout);
}
this.options.width = width;
this.width_timeout = window.setTimeout(jQuery.proxy(function() {
this.width_timeout = null;
if(this.div)
{
this.div.outerWidth(this.options.width);
this.header.outerWidth(this.options.width);
}
},this),1);
if(this.div)
{
this.div.outerWidth(this.options.width);
this.header.outerWidth(this.options.width);
}
},
/**

9
calendar/js/et2_widget_timegrid.js
View File

@ -869,18 +869,15 @@ var et2_calendar_timegrid = et2_calendar_view.extend([et2_IDetachedDOM, et2_IRes
before = true;
}
if(delete_index < 0) delete_index = 0;
// Wait until any animations or other timeouts are done
window.setTimeout(jQuery.proxy(function() {
this.div.hide();
this.header.hide();
this.free();
},this.day_widgets[delete_index]),1000);
// Widgets that are before our date shrink, after just get pushed out
if(before)
{
this.day_widgets[delete_index].set_width('0px');
}
this.day_widgets[delete_index].div.hide();
this.day_widgets[delete_index].header.hide();
this.day_widgets[delete_index].destroy();
this.day_widgets.splice(delete_index--,1);
}

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

@ -107,14 +107,12 @@
#calendar-todo {
position: absolute;
width: 30%;
margin-top: 0px;/* Nice transition when changing days in a week */
transition: 1s ease-in-out;
margin-top: 0px;
z-index: 10;
}
#calendar-view {
width: 100%;
transition: width 1s ease-in-out;
}
#calendar-view_view td {
padding: 0px;
@ -320,8 +318,8 @@ Hide subsequent headers in week view with non-consolidated owners
* left:
* width:
*/
border-left: 1px solid silver;/* Nice transition when changing days in a week */
-webkit-transition: 0.1s ease-in-out;
border-left: 1px solid silver;
transition: none;
}
/* Calendar Id #
*/
@ -341,8 +339,8 @@ Hide subsequent headers in week view with non-consolidated owners
border-right: 1px solid silver;
height: initial;
min-height: 2em;
/* Nice transition when changing days in a week */
transition: width 1s ease-in-out;
transition: none;
z-index:30;
white-space: initial;
padding-bottom: 2ex;
@ -1202,7 +1200,7 @@ img.calendar_print_button, img.calendar_print_appicon {
*/
.calendar_slide {
/* There is a cleanup timeout in calendar app.js line 563 that must match */
transition-duration: 2s;
transition-duration: 0s; /* was 2s */
transition-delay: 50ms;
}

14
calendar/templates/pixelegg/app.css
View File

@ -11,7 +11,7 @@
* @package calendar
* @version $Id$
*/
/* $Id: app.css 54905 2016-02-02 22:59:13Z nathangray $ */
/* $Id: app.css 54911 2016-02-03 16:52:28Z nathangray $ */
/*Media print classes*/
@media print {
.th td,
@ -121,13 +121,10 @@
position: absolute;
width: 30%;
margin-top: 0px;
/* Nice transition when changing days in a week */
transition: 1s ease-in-out;
z-index: 10;
}
#calendar-view {
width: 100%;
transition: width 1s ease-in-out;
}
#calendar-view_view td {
padding: 0px;
@ -333,8 +330,7 @@ Hide subsequent headers in week view with non-consolidated owners
* width:
*/
border-left: 1px solid silver;
/* Nice transition when changing days in a week */
-webkit-transition: 0.1s ease-in-out;
transition: none;
}
/* Calendar Id #
*/
@ -356,8 +352,7 @@ Hide subsequent headers in week view with non-consolidated owners
border-right: 1px solid silver;
height: initial;
min-height: 2em;
/* Nice transition when changing days in a week */
transition: width 1s ease-in-out;
transition: none;
z-index: 30;
white-space: initial;
padding-bottom: 2ex;
@ -1186,7 +1181,8 @@ img.calendar_print_appicon {
*/
.calendar_slide {
/* There is a cleanup timeout in calendar app.js line 563 that must match */
transition-duration: 2s;
transition-duration: 0s;
/* was 2s */
transition-delay: 50ms;
}
/**

1
calendar/templates/pixelegg/app.less
View File

@ -13,7 +13,6 @@
*/
@import (reference) "../../../pixelegg/less/definitions.less";
@import (less) "../default/app.css";