diff options
| author | Andres Ornelas | 2010-08-04 11:45:42 -0700 |
|---|---|---|
| committer | Andres Ornelas | 2010-08-04 11:45:42 -0700 |
| commit | ec12285c9d213a50b86b2ff8d968686acd6d1693 (patch) | |
| tree | 94c0792946bfa461c4fab525b3758b06c6da9f9f /scenario | |
| parent | ef88eb9a71ee7666029c4fb5eb731ce2e986cecc (diff) | |
| parent | 89245f3a527415a80d46b37054b558454c314532 (diff) | |
| download | angular.js-ec12285c9d213a50b86b2ff8d968686acd6d1693.tar.bz2 | |
Merge branch 'master' of github.com:angular/angular.js into future
Diffstat (limited to 'scenario')
| -rw-r--r-- | scenario/location.html | 19 | ||||
| -rw-r--r-- | scenario/widgets.html | 8 |
2 files changed, 23 insertions, 4 deletions
diff --git a/scenario/location.html b/scenario/location.html new file mode 100644 index 00000000..75041615 --- /dev/null +++ b/scenario/location.html @@ -0,0 +1,19 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <link rel="stylesheet" type="text/css" href="style.css"/> + <script type="text/javascript" src="../src/angular-bootstrap.js#autobind"></script> + </head> + <body ng:init="$window.$scope = this"> + <pre>$location={{$location}}</pre> + Hash Search: + <ul> + <li ng:repeat="(key, value) in $location.hashSearch"><tt>{{key}}={{value}}</tt></li> + </ul> + <hr/> + href: <input type="text" name="$location.href" size="120"/> <br/> + hash: <input type="text" name="$location.hash" size="120"/> <br/> + hashPath: <input type="text" name="$location.hashPath" size="120"/> <br/> + hashSearch: <input type="text" name="$location.hashSearch" size="120" ng:format="json"/> <br/> + </body> + </html> diff --git a/scenario/widgets.html b/scenario/widgets.html index 2626843d..d5285ea6 100644 --- a/scenario/widgets.html +++ b/scenario/widgets.html @@ -72,12 +72,12 @@ </tr> <tr><th colspan="3">Buttons</th></tr> <tr> - <td>ng-change<br/>ng:click</td> + <td>ng:change<br/>ng:click</td> <td ng:init="button.count = 0"> <form> - <input type="button" value="button" ng-change="button.count = button.count + 1"/> <br/> - <input type="submit" value="submit" ng-change="button.count = button.count + 1"/><br/> - <input type="image" src="" ng-change="button.count = button.count + 1"/><br/> + <input type="button" value="button" ng:change="button.count = button.count + 1"/> <br/> + <input type="submit" value="submit" ng:change="button.count = button.count + 1"/><br/> + <input type="image" src="" ng:change="button.count = button.count + 1"/><br/> <a href="" ng:click="button.count = button.count + 1">action</a> </form> </td> |