Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-28 15:28:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(defer.cancel): should return false instead of undefined

Browse source
This commit is contained in:
Igor Minar 2011-10-22 21:32:16 -07:00
parent ad90c3574f
commit bacc31bea9
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Browser.js
View file

@ -404,6 +404,7 @@ function Browser(window, document, body, XHR, $log, $sniffer) {
completeOutstandingRequest(noop); completeOutstandingRequest(noop);
return true; return true;
} }
return false;
}; };

2
src/angular-mocks.js vendored
View file

@ -285,6 +285,8 @@ function MockBrowser() {
self.deferredFns.splice(fnIndex, 1); self.deferredFns.splice(fnIndex, 1);
return true; return true;
} }
return false;
}; };

5
test/BrowserSpecs.js
View file

@ -266,10 +266,11 @@ describe('browser', function() {
deferId3 = browser.defer(function() { log.push('cancel me, now!'); }); deferId3 = browser.defer(function() { log.push('cancel me, now!'); });
expect(log).toEqual([]); expect(log).toEqual([]);
browser.defer.cancel(deferId1); expect(browser.defer.cancel(deferId1)).toBe(true);
browser.defer.cancel(deferId3); expect(browser.defer.cancel(deferId3)).toBe(true);
fakeWindow.setTimeout.flush(); fakeWindow.setTimeout.flush();
expect(log).toEqual(['ok']); expect(log).toEqual(['ok']);
expect(browser.defer.cancel(deferId2)).toBe(false);
}); });
}); });
}); });

2
test/service/deferSpec.js
View file

@ -114,7 +114,7 @@ describe('$defer', function() {
$browser.defer.flush(); $browser.defer.flush();
token2 = $defer(task2); token2 = $defer(task2);
expect($defer.cancel(token1)).toBeFalsy(); expect($defer.cancel(token1)).toBe(false);
expect($defer.cancel(token2)).toBe(true); expect($defer.cancel(token2)).toBe(true);
}); });
}); });