aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content/cookbook/deeplinking.ngdoc
diff options
context:
space:
mode:
authorVojta Jina2011-07-12 02:18:46 +0200
committerVojta Jina2011-09-08 23:00:59 +0200
commit4421f3d43525437bd939f647604480c1ed126e5e (patch)
treeb27657098ccf4395827871533ba8bb2b5a90e7fc /docs/content/cookbook/deeplinking.ngdoc
parent22cb600280cecabf719ba1878719c907aa01ba18 (diff)
downloadangular.js-4421f3d43525437bd939f647604480c1ed126e5e.tar.bz2
fix(docs): update docs to reflect new $location and fix e2e tests
Diffstat (limited to 'docs/content/cookbook/deeplinking.ngdoc')
-rw-r--r--docs/content/cookbook/deeplinking.ngdoc10
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/content/cookbook/deeplinking.ngdoc b/docs/content/cookbook/deeplinking.ngdoc
index e49287bb..10c80f21 100644
--- a/docs/content/cookbook/deeplinking.ngdoc
+++ b/docs/content/cookbook/deeplinking.ngdoc
@@ -43,7 +43,7 @@ The two partials are defined in the following URLs:
AppCntl.$inject = ['$route']
function AppCntl($route) {
// define routes
- $route.when("", {template:'./examples/welcome.html', controller:WelcomeCntl});
+ $route.when("/welcome", {template:'./examples/welcome.html', controller:WelcomeCntl});
$route.when("/settings", {template:'./examples/settings.html', controller:SettingsCntl});
$route.parent(this);
@@ -61,7 +61,9 @@ The two partials are defined in the following URLs:
}
};
- function SettingsCntl(){
+ SettingsCntl.$inject = ['$location'];
+ function SettingsCntl($location){
+ this.$location = $location;
this.cancel();
}
SettingsCntl.prototype = {
@@ -71,13 +73,13 @@ The two partials are defined in the following URLs:
save: function(){
angular.copy(this.form, this.person);
- window.location.hash = "#";
+ this.$location.path('/welcome');
}
};
</script>
<div ng:controller="AppCntl">
<h1>Your App Chrome</h1>
- [ <a href="#">Welcome</a> | <a href="#/settings">Settings</a> ]
+ [ <a href="#!/welcome">Welcome</a> | <a href="#!/settings">Settings</a> ]
<hr/>
<span style="background-color: blue; color: white; padding: 3px;">
Partial: {{$route.current.template}}