aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojta Jina2010-10-18 19:19:49 +0100
committerMisko Hevery2010-10-18 14:13:48 -0700
commitd0e55bf4465bdfe6660f75d26882bc1d9da9b924 (patch)
treed8c4c91c072d43b54768fca1611cfd675117897d
parent1cad16c6f9144113e2b458ce91af8fcb0211c173 (diff)
downloadangular.js-d0e55bf4465bdfe6660f75d26882bc1d9da9b924.tar.bz2
Removed $location.cancel() method (and related test)
-rw-r--r--src/services.js15
-rw-r--r--test/servicesSpec.js10
2 files changed, 1 insertions, 24 deletions
diff --git a/src/services.js b/src/services.js
index f9133aca..0b5923c6 100644
--- a/src/services.js
+++ b/src/services.js
@@ -15,7 +15,7 @@ angularServiceInject("$document", function(window){
angularServiceInject("$location", function(browser) {
var scope = this,
- location = {toString:toString, update:update, updateHash: updateHash, cancel: cancel},
+ location = {toString:toString, update:update, updateHash: updateHash},
lastLocationHref = browser.getUrl(),
lastLocationHash;
@@ -101,19 +101,6 @@ angularServiceInject("$location", function(browser) {
return location.href;
}
- /**
- * Cancel change of the location
- *
- * Calling update(), updateHash() or setting a property does not immediately
- * change the browser's url. Url is changed at the end of $eval()
- *
- * By calling this method, you can cancel the change (before end of $eval())
- *
- */
- function cancel() {
- update(lastLocationHref);
- }
-
// INNER METHODS
/**
diff --git a/test/servicesSpec.js b/test/servicesSpec.js
index 77ad59df..cf45becb 100644
--- a/test/servicesSpec.js
+++ b/test/servicesSpec.js
@@ -227,16 +227,6 @@ describe("service", function(){
expect(scope.$location.hash).toEqual('path?a=b');
expect(scope.$location.hashSearch).toEqual({a: 'b'});
expect(scope.$location.hashPath).toEqual('path');
- });
-
- it('should not update browser if you call cancel()', function() {
- spyOn($browser, 'setUrl');
-
- scope.$location.update('http://www.angularjs.org/a/b#a/b');
- scope.$location.cancel();
- scope.$eval();
-
- expect($browser.setUrl).not.toHaveBeenCalled();
});
});