extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix clicking on month labels in planner monthly view opens add dialog

Browse Source 
- Keep AJAX loading spinner up until done
This commit is contained in:
nathangray 2016-05-27 14:57:31 -06:00
parent 43f65b81e5
commit 80a7a121ed
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/js/app.js
View File

@ -2850,9 +2850,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
app.calendar._fetch_data(state, instance, start + data.order.length); app.calendar._fetch_data(state, instance, start + data.order.length);
}, 100); }, 100);
} }
// Hide AJAX loader // Hide AJAX loader
if(typeof framework !== 'undefined') else if(typeof framework !== 'undefined')
{ {
framework.applications.calendar.sidemenuEntry.hideAjaxLoader(); framework.applications.calendar.sidemenuEntry.hideAjaxLoader();
} }

5
calendar/js/et2_widget_planner.js
View File

@ -702,7 +702,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
this.widget.update_timer = null; this.widget.update_timer = null;
this.widget.doInvalidate = true; this.widget.doInvalidate = true;
window.setTimeout(jQuery.proxy(function() {if(this.loader) this.loader.hide();},this.widget),100); window.setTimeout(jQuery.proxy(function() {if(this.loader) this.loader.hide();},this.widget),500);
},{widget:this,"trigger":trigger}),ET2_GRID_INVALIDATE_TIMEOUT); },{widget:this,"trigger":trigger}),ET2_GRID_INVALIDATE_TIMEOUT);
}, },
@ -1779,7 +1779,8 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
} }
return result; return result;
} }
else if (this.gridHeader.has(_ev.target).length > 0 && !jQuery.isEmptyObject(_ev.target.dataset)) else if (this.gridHeader.has(_ev.target).length > 0 && !jQuery.isEmptyObject(_ev.target.dataset) ||
$j(_ev.target).hasClass('calendar_plannerRowHeader') && !jQuery.isEmptyObject(_ev.target.dataset))
{ {
// Click on a header, we can go there // Click on a header, we can go there
_ev.data = jQuery.extend({},_ev.target.parentNode.dataset, _ev.target.dataset); _ev.data = jQuery.extend({},_ev.target.parentNode.dataset, _ev.target.dataset);