|
@@ -141,13 +141,14 @@ describe('removeEventSource', function() {
|
|
|
it('correctly removes events provided via `events` at initialization', function(done) {
|
|
it('correctly removes events provided via `events` at initialization', function(done) {
|
|
|
var callCnt = 0;
|
|
var callCnt = 0;
|
|
|
options.eventAfterAllRender = function() {
|
|
options.eventAfterAllRender = function() {
|
|
|
- if (!(callCnt++)) { // only the first time
|
|
|
|
|
|
|
+ callCnt++;
|
|
|
|
|
+ if (callCnt === 1) {
|
|
|
expectEventCnt(2);
|
|
expectEventCnt(2);
|
|
|
$('#cal').fullCalendar('removeEventSource', eventInput);
|
|
$('#cal').fullCalendar('removeEventSource', eventInput);
|
|
|
- setTimeout(function() { // because event rerender will queue up for later
|
|
|
|
|
- expectEventCnt(0);
|
|
|
|
|
- done();
|
|
|
|
|
- }, 0);
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (callCnt === 2) {
|
|
|
|
|
+ expectEventCnt(0);
|
|
|
|
|
+ done();
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
options.events = eventInput;
|
|
options.events = eventInput;
|
|
@@ -157,13 +158,14 @@ describe('removeEventSource', function() {
|
|
|
it('correctly removes events provided via `eventSources` at initialization', function(done) {
|
|
it('correctly removes events provided via `eventSources` at initialization', function(done) {
|
|
|
var callCnt = 0;
|
|
var callCnt = 0;
|
|
|
options.eventAfterAllRender = function() {
|
|
options.eventAfterAllRender = function() {
|
|
|
- if (!(callCnt++)) { // only the first time
|
|
|
|
|
|
|
+ callCnt++;
|
|
|
|
|
+ if (callCnt === 1) {
|
|
|
expectEventCnt(2);
|
|
expectEventCnt(2);
|
|
|
$('#cal').fullCalendar('removeEventSource', eventInput);
|
|
$('#cal').fullCalendar('removeEventSource', eventInput);
|
|
|
- setTimeout(function() { // because event rerender will queue up for later
|
|
|
|
|
- expectEventCnt(0);
|
|
|
|
|
- done();
|
|
|
|
|
- }, 0);
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (callCnt === 2) {
|
|
|
|
|
+ expectEventCnt(0);
|
|
|
|
|
+ done();
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
options.eventSources = [ eventInput ];
|
|
options.eventSources = [ eventInput ];
|
|
@@ -173,17 +175,20 @@ describe('removeEventSource', function() {
|
|
|
it('correctly removes events provided via `addEventSource` method', function(done) {
|
|
it('correctly removes events provided via `addEventSource` method', function(done) {
|
|
|
var callCnt = 0;
|
|
var callCnt = 0;
|
|
|
options.eventAfterAllRender = function() {
|
|
options.eventAfterAllRender = function() {
|
|
|
- if ((callCnt++) === 1) { // the second time (the first time is upon initial render)
|
|
|
|
|
|
|
+ callCnt++;
|
|
|
|
|
+ if (callCnt === 1) {
|
|
|
|
|
+ $('#cal').fullCalendar('addEventSource', eventInput);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (callCnt === 2) {
|
|
|
expectEventCnt(2);
|
|
expectEventCnt(2);
|
|
|
$('#cal').fullCalendar('removeEventSource', eventInput);
|
|
$('#cal').fullCalendar('removeEventSource', eventInput);
|
|
|
- setTimeout(function() { // because event rerender will queue up for later
|
|
|
|
|
- expectEventCnt(0);
|
|
|
|
|
- done();
|
|
|
|
|
- }, 0);
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (callCnt === 3) {
|
|
|
|
|
+ expectEventCnt(0);
|
|
|
|
|
+ done();
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
$('#cal').fullCalendar(options);
|
|
$('#cal').fullCalendar(options);
|
|
|
- $('#cal').fullCalendar('addEventSource', eventInput);
|
|
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|