|
@@ -148,7 +148,7 @@ function EventManager(options) { // assumed to be a calendar
|
|
|
var events = source.events;
|
|
var events = source.events;
|
|
|
if (events) {
|
|
if (events) {
|
|
|
if ($.isFunction(events)) {
|
|
if ($.isFunction(events)) {
|
|
|
- pushLoading();
|
|
|
|
|
|
|
+ t.pushLoading();
|
|
|
events.call(
|
|
events.call(
|
|
|
t, // this, the Calendar object
|
|
t, // this, the Calendar object
|
|
|
rangeStart.clone(),
|
|
rangeStart.clone(),
|
|
@@ -156,7 +156,7 @@ function EventManager(options) { // assumed to be a calendar
|
|
|
options.timezone,
|
|
options.timezone,
|
|
|
function(events) {
|
|
function(events) {
|
|
|
callback(events);
|
|
callback(events);
|
|
|
- popLoading();
|
|
|
|
|
|
|
+ t.popLoading();
|
|
|
}
|
|
}
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
@@ -202,7 +202,7 @@ function EventManager(options) { // assumed to be a calendar
|
|
|
data[timezoneParam] = options.timezone;
|
|
data[timezoneParam] = options.timezone;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- pushLoading();
|
|
|
|
|
|
|
+ t.pushLoading();
|
|
|
$.ajax($.extend({}, ajaxDefaults, source, {
|
|
$.ajax($.extend({}, ajaxDefaults, source, {
|
|
|
data: data,
|
|
data: data,
|
|
|
success: function(events) {
|
|
success: function(events) {
|
|
@@ -219,7 +219,7 @@ function EventManager(options) { // assumed to be a calendar
|
|
|
},
|
|
},
|
|
|
complete: function() {
|
|
complete: function() {
|
|
|
applyAll(complete, this, arguments);
|
|
applyAll(complete, this, arguments);
|
|
|
- popLoading();
|
|
|
|
|
|
|
+ t.popLoading();
|
|
|
}
|
|
}
|
|
|
}));
|
|
}));
|
|
|
}else{
|
|
}else{
|
|
@@ -434,25 +434,6 @@ function EventManager(options) { // assumed to be a calendar
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- /* Loading State
|
|
|
|
|
- -----------------------------------------------------------------------------*/
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- function pushLoading() {
|
|
|
|
|
- if (!(loadingLevel++)) {
|
|
|
|
|
- trigger('loading', null, true, getView());
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- function popLoading() {
|
|
|
|
|
- if (!(--loadingLevel)) {
|
|
|
|
|
- trigger('loading', null, false, getView());
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/* Event Normalization
|
|
/* Event Normalization
|
|
|
-----------------------------------------------------------------------------*/
|
|
-----------------------------------------------------------------------------*/
|
|
|
|
|
|