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

Hide granularity change so you don't have to see it

Browse Source
This commit is contained in:
Nathan Gray 2016-04-25 22:09:57 +00:00
parent ec1f6e9068
commit 4ef7afca9e
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calendar/js/app.js
View File

@ -2075,6 +2075,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
}
if(widget.set_granularity)
{
if(widget.loader) widget.loader.show();
widget.set_granularity(view.granularity(state.state));
}
if(widget.id == value[row_index].id &&

4
calendar/js/et2_widget_timegrid.js
View File

@ -562,7 +562,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
this.widget.change();
}
// Hide loader
window.setTimeout(jQuery.proxy(function() {this.loader.hide();},this.widget),100);
window.setTimeout(jQuery.proxy(function() {this.loader.hide();},this.widget),200);
},{widget:this,"trigger":trigger}),ET2_GRID_INVALIDATE_TIMEOUT);
},
@ -1388,7 +1388,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
// None of the above changed anything, hide the loader
if(!this.update_timer)
{
window.setTimeout(jQuery.proxy(function() {this.loader.hide();},this),100);
window.setTimeout(jQuery.proxy(function() {this.loader.hide();},this),200);
}
},

2
calendar/js/et2_widget_view.js
View File

@ -294,7 +294,7 @@ var et2_calendar_view = (function(){ "use strict"; return et2_valueWidget.extend
// None of the above changed anything, hide the loader
if(!this.update_timer)
{
window.setTimeout(jQuery.proxy(function() {this.loader.hide();},this),100);
window.setTimeout(jQuery.proxy(function() {this.loader.hide();},this),200);
}
},

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

@ -275,6 +275,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
right: 0px;
position: absolute;
}
.calendar_calTimeGrid .loading::before ,.calendar_plannerWidget .loading::before {
opacity: 1;
background-color: #E6E6E6;
}
/* Timegrid that has hit a minimum size */
.calendar_calTimeGridFixed .calendar_calTimeGridScroll {
overflow: hidden;

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

@ -11,7 +11,7 @@
* @package calendar
* @version $Id$
*/
/* $Id: app.css 55784 2016-04-20 15:07:01Z nathangray $ */
/* $Id: app.css 55805 2016-04-21 20:30:48Z nathangray $ */
/*Media print classes*/
@media print {
#calendar-view.et2_container,
@ -280,6 +280,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
right: 0px;
position: absolute;
}
.calendar_calTimeGrid .loading::before,
.calendar_plannerWidget .loading::before {
opacity: 1;
background-color: #E6E6E6;
}
/* Timegrid that has hit a minimum size */
.calendar_calTimeGridFixed .calendar_calTimeGridScroll {
overflow: hidden;