cutting the 0.9.11 snow-maker release

- split trim into trim and indent
- merged my indentation code with trim
- cleaned up some small issues

.externalToolBuilders/docs.launch

@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/angular.js/build&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/angular.js/docs&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/angular.js/src&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/angular.js/gen_docs.sh}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>

.gitignore

@@ -2,5 +2,6 @@ build/
 angularjs.netrc
 jstd.log
 .DS_Store
-regression/temp.html
+regression/temp*.html
+performance/temp*.html
 .idea/workspace.xml

.project

@@ -16,7 +16,7 @@
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/JSTD_Tests.launch</value>
+					<value>&lt;project&gt;/.externalToolBuilders/docs.launch</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
@@ -26,7 +26,7 @@
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/docs.launch</value>
+					<value>&lt;project&gt;/.externalToolBuilders/JSTD_Tests.launch</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>

.settings/de.loskutov.anyedit.AnyEditTools.prefs

@@ -0,0 +1,16 @@
+#Mon Jan 24 10:31:47 PST 2011
+activeContentFilterList=*.makefile,makefile,*.Makefile,Makefile,Makefile.*,*.mk,MANIFEST.MF
+addNewLine=true
+convertActionOnSaave=AnyEdit.CnvrtTabToSpaces
+eclipse.preferences.version=1
+inActiveContentFilterList=
+javaTabWidthForJava=true
+org.eclipse.jdt.ui.editor.tab.width=2
+projectPropsEnabled=false
+removeTrailingSpaces=true
+replaceAllSpaces=false
+replaceAllTabs=false
+saveAndAddLine=true
+saveAndConvert=true
+saveAndTrim=true
+useModulo4Tabs=false

CHANGELOG.md

@@ -1,3 +1,147 @@
+<a name="0.9.11"><a/>
+# <angular/> 0.9.11 snow-maker  (2011-02-08) #
+
+### Documentation
+- completed migration of docs from the wiki site to
+  [http://docs.angularjs.org/](http://docs.angularjs.org/)
+- many, but by far not all, docs were updated, improved and cleaned up
+
+### Features
+- [`$route`](http://docs.angularjs.org/#!angular.service.$route) service now supports these
+  features:
+  - route not found handling via `#otherwise()`
+  - redirection support via `#when('/foo', {redirectTo: '/bar'})` (including param interpolation)
+  - setting the parent scope for scopes created by the service via `#parent()`
+  - reloading the current route via `#reload()`
+
+### Bug Fixes
+- <option> value attribute gets clobbered when the element contains new line character(s).
+- <ng:view> widget now works when nested inside an <ng:include> widget
+- other various small fixes
+
+### Breaking changes
+- mock [`$browser`](http://docs.angularjs.org/#!angular.mock.service.$browser) now throws an
+  exception if the `flush()` method is called when there are no requests to be flushed. If you
+  experience `No xhr requests to be flushed!` errors in your tests, it's because you called
+  `$browser.xhr.flush()` unexpectedly. To make the error go away, either make sure your code makes a
+  request via the `$xhr` service or remove all unneeded `flush()` calls.
+
+
+<a name="0.9.10"><a/>
+# <angular/> 0.9.10 flea-whisperer  (2011-01-26) #
+
+### Features
+- new [`ng:view`](http://docs.angularjs.org/#!angular.widget.ng:view) widget to simplify integration
+with the `$route` service
+- the content of all standard HTML widgets is now being processed
+  (e.g. `<button>{{foo}}</button>` works now) (commit 1d7b9d56)
+- new [`$log`](http://docs.angularjs.org/#!angular.mock.service.$log) and
+  [`$exceptionHandler`](http://docs.angularjs.org/#!angular.mock.service.$exceptionHandler) service
+  mocks now part of `angular-mocks.js` (commit f5d08963)
+
+### Bug Fixes
+- <select> (one/multiple) could not chose from a list of objects (commit 347be5ae)
+- null and other falsy values should not be rendered in the view (issue #242)
+
+### Docs
+- rewrite of several major portions of angular.service.*, angular.Array.*, angular.Object.* docs
+- added support for [sitemap]((http://docs.angularjs.org/sitemap.xml) to make the docs indexable by
+  search crawlers
+- transition of Developer Guide docs from the wiki into docs.angularjs.org
+- lots of improvements related to formatting of the content of docs.anguarjs.org
+
+
+<a name="0.9.9"><a/>
+# <angular/> 0.9.9 time-shift (2011-01-13) #
+
+### Security
+- Added a just in case security check for JSON parsing. (commit 5f080193)
+- Completed security review with the Google Security Team.
+
+### Performance
+- $location and $cookies services are now lazily initialized to avoid the polling overhead when
+  not needed.
+- $location service now listens for `onhashchange` events (if supported by browser) instead of
+  constant polling. (commit 16086aa3)
+- input widgets known listens on keydown events instead of keyup which improves perceived
+  performance (commit 47c454a3)
+- angular boots significantly sooner by listening for DOMContentLoaded event instead of
+  window.load when supported by browser (commit c79aba92)
+- new service $updateView which may be used in favor of $root.$eval() to run a complete eval on
+  the entire document. This service bulks and throttles DOM updates to improve performance.
+  (commit 47c454a3)
+
+### Docs
+- Major improvements to the doc parser (commit 4f22d686)
+- Docs now offline enabled (all dependencies are bundled in the tarball) (commit 4f5d5029)
+- Added support for navigating the docs app with keyboard shortcuts (tab and ctrl+alt+s)
+
+### Bugfixes
+- `angular.Object.equals` now properly handless comparing an object with a null (commit b0be87f6)
+- Several issues were addressed in the `$location` service (commit 23875cb3)
+- angular.filter.date now properly handles some corner-cases (issue #159 - fix contributed by Vojta)
+
+### Breaking changes
+- API for accessing registered services — `scope.$inject` — was renamed to
+  [`scope.$service`](http://docs.angularjs.org/#!angular.scope.$service). (commit b2631f61)
+
+- Support for `eager-published` services was removed. This change was done to make explicit
+  dependency declaration always required in order to allow making relatively expensive services
+  lazily initialized (e.g. $cookie, $location), as well as remove 'magic' and reduce unnecessary
+  scope namespace pollution. (commit 3ea5941f)
+
+  Complete list of affected services:
+
+  - $location
+  - $route
+  - $cookies
+  - $window
+  - $document
+  - $exceptionHandler
+  - $invalidWidgets
+
+  To temporarily preserve the 'eager-published' status for these services, you may use `ng:init`
+  (e.g. `ng:init="$location = $service('$location'), ...`) in the view or more correctly create
+  a service like this:
+
+      angular.service('published-svc-shim', function($location, $route, $cookies, $window,
+          $document, $exceptionHandler, $invalidWidgets) {
+        this.$location = $location;
+        this.$route = $route;
+        this.$cookies = $cookies;
+        this.$window = $window;
+        this.$document = $document;
+        this.$exceptionHandler = $exceptionHandler;
+        this.$invalidWidgets = $invalidWidgets;
+      }, {$inject: ['$location', '$route', '$cookies', '$window', '$document', '$exceptionHandler',
+                    '$invalidWidgets'],
+          $eager: true});
+
+- In the light of the `eager-published` change, to complete the cleanup we renamed `$creation`
+  property of services to `$eager` with its value being a boolean.
+  To transition, please rename all `$creation: 'eager'` declarations to `$eager: true`.
+  (commit 1430c6d6)
+
+- `angular.foreach` was renamed to `angular.forEach` to make the api consistent. (commit 0a6cf70d)
+
+- The `toString` method of the `angular.service.$location` service was removed. (commit 23875cb3)
+
+
+<a name="0.9.8"><a/>
+# <angular/> 0.9.8 astral-projection (2010-12-23) #
+
+### Docs/Getting started
+- angular-seed project to get you hacking on an angular apps quickly
+  https://github.com/angular/angular-seed
+
+### Performance
+- Delegate JSON parsing to native parser (JSON.parse) if available
+
+### Bug Fixes
+- Ignore input widgets which have no name (issue #153)
+
+
+<a name="0.9.7"><a/>
 # <angular/> 0.9.7 sonic-scream (2010-12-10) #
 
 ### Bug Fixes
@@ -10,12 +154,13 @@
 - small docs improvements (mainly docs for the $resource service)
 
 ### Breaking changes
-- Angular expressions in the view used to support regular expressions. This feature was rarely 
-  used and added unnecessary complexity. It not a good idea to have regexps in the view anyway, 
-  so we removed this support. If you had any regexp in your views, you will have to move them to 
+- Angular expressions in the view used to support regular expressions. This feature was rarely
+  used and added unnecessary complexity. It not a good idea to have regexps in the view anyway,
+  so we removed this support. If you had any regexp in your views, you will have to move them to
   your controllers. (commit e5e69d9b90850eb653883f52c76e28dd870ee067)
 
 
+<a name="0.9.6"><a/>
 # <angular/> 0.9.6 night-vision (2010-12-06) #
 
 ### Security
@@ -31,7 +176,7 @@
 - docs app UI polishing with dual scrolling and other improvements
 
 ### Bug Fixes
-- `select` widget now behaves correctly when it's `option` items are created via `ng:repeat` 
+- `select` widget now behaves correctly when it's `option` items are created via `ng:repeat`
   (issue #170)
 - fix for async xhr cache issue #152 by adding `$browser.defer` and `$defer` service
 
@@ -45,6 +190,7 @@
 - The HTML sanitizer is slightly more strinct now. Please see info in the "Security" section above.
 
 
+<a name="0.9.5"><a/>
 # <angular/> 0.9.5 turkey-blast (2010-11-25) #
 
 ### Docs
@@ -54,6 +200,7 @@
 - added `angular.Array.limitTo` to make it easy to select first or last few items of an array
 
 
+<a name="0.9.4"><a/>
 # <angular/> 0.9.4 total-recall (2010-11-18) #
 
 ### Docs
@@ -70,6 +217,7 @@
 - Better error handling - compilation exception now contain stack trace (commit b2d63ac4)
 
 
+<a name="0.9.3"><a/>
 # <angular/> 0.9.3 cold-resistance (2010-11-10) #
 
 ### Docs
@@ -97,6 +245,7 @@
   simple RegExp validator.
 
 
+<a name="0.9.2"><a/>
 # <angular/> 0.9.2 faunal-mimicry (2010-11-03) #
 
 ### Docs
@@ -134,6 +283,7 @@
   implements HEAD
 
 
+<a name="0.9.1"><a/>
 # <angular/> 0.9.1 repulsion-field (2010-10-26) #
 
 ### Security
@@ -160,6 +310,7 @@
 - html filter now sanitizes html content for XSS attacks which may result in different behavior
 
 
+<a name="0.9.0"><a/>
 # <angular/> 0.9.0 dragon-breath (2010-10-20) #
 
 ### Security

Rakefile

@@ -158,7 +158,7 @@ end
 
 desc 'Generate docs'
 task :docs do
-  `node docs/collect.js`
+  `node docs/src/gen-docs.js`
 end
 
 
@@ -174,7 +174,7 @@ task :package => [:clean, :compile, :docs] do
   FileUtils.rm_r(path_to('pkg'), :force => true)
   FileUtils.mkdir_p(pkg_dir)
 
-  ['test/angular-mocks.js',
+  ['src/angular-mocks.js',
     path_to('angular.js'),
     path_to('angular.min.js'),
     path_to('angular-ie-compat.js'),

docs/angular.attrMarkup.ngdoc

@@ -0,0 +1,15 @@
+@workInProgress
+@ngdoc overview
+@name angular.attrMarkup
+
+@description
+Attribute markup extends the angular compiler in a very similar way as {@link angular.markup} except
+that it allows you to modify the state of the attribute text rather then the contest of a node.
+
+<pre>
+angular.attrMarkup('extraClass', function(attrValue, attrName, element){
+  if (attrName == 'additional-class') {
+    element.addClass(attrValue);
+  }
+});
+</pre>

docs/angular.filter.ngdoc

@@ -46,12 +46,13 @@ You can use these variables in the function:
   the DOM in addition to transforming the input.
 
 
-@exampleDescription
+@example
  The following example filter reverses a text string. In addition, it conditionally makes the
  text upper-case (to demonstrate optional arguments) and assigns color (to demonstrate DOM
  modification).
 
-@example
+<doc:example>
+ <doc:source>
    <script type="text/javascript">
      angular.filter('reverse', function(input, uppercase, color) {
        var out = "";
@@ -73,4 +74,14 @@ You can use these variables in the function:
    Reverse: {{text|reverse}}<br>
    Reverse + uppercase: {{text|reverse:true}}<br>
    Reverse + uppercase + blue:  {{text|reverse:true:"blue"}}
+ </doc:source>
+ <doc:scenario>
+  it('should reverse text', function(){
+    expect(binding('text|reverse')).toEqual('olleh');
+    input('text').enter('ABC');
+    expect(binding('text|reverse')).toEqual('CBA');
+  });
+ </doc:scenario>
+</doc:example>
+
 

docs/angular.formatter.ngdoc

@@ -8,13 +8,13 @@ The formatters are responsible for translating user readable text in an input wi
 data model stored in an application.
 
 # Writting your own Formatter
-Writing your own formatter is easy. Just register a pair of JavaScript functions with 
-`angular.formatter`. One function for parsing user input text to the stored form, 
+Writing your own formatter is easy. Just register a pair of JavaScript functions with
+`angular.formatter`. One function for parsing user input text to the stored form,
 and one for formatting the stored data to user-visible text.
 
-Here is an example of a "reverse" formatter: The data is stored in uppercase and in 
-reverse, while it is displayed in lower case and non-reversed. User edits are 
-automatically parsed into the internal form and data changes are automatically 
+Here is an example of a "reverse" formatter: The data is stored in uppercase and in
+reverse, while it is displayed in lower case and non-reversed. User edits are
+automatically parsed into the internal form and data changes are automatically
 formatted to the viewed form.
 
 <pre>
@@ -37,42 +37,46 @@ angular.formatter('reverse', {
 </pre>
 
 @example
-<script type="text/javascript">
-function reverse(text) {
-  var reversed = [];
-  for (var i = 0; i < text.length; i++) {
-    reversed.unshift(text.charAt(i));
+<doc:example>
+ <doc:source>
+  <script type="text/javascript">
+  function reverse(text) {
+    var reversed = [];
+    for (var i = 0; i < text.length; i++) {
+      reversed.unshift(text.charAt(i));
+    }
+    return reversed.join('');
   }
-  return reversed.join('');
-}
 
-angular.formatter('reverse', {
-  parse: function(value){
-    return reverse(value||'').toUpperCase();
-  },
-  format: function(value){
-    return reverse(value||'').toLowerCase();
-  }
-});
-</script>
+  angular.formatter('reverse', {
+    parse: function(value){
+      return reverse(value||'').toUpperCase();
+    },
+    format: function(value){
+      return reverse(value||'').toLowerCase();
+    }
+  });
+  </script>
 
-Formatted: 
-<input type="text" name="data" value="angular" ng:format="reverse"/>
-<br/>
+  Formatted:
+  <input type="text" name="data" value="angular" ng:format="reverse"/>
+  <br/>
 
-Stored: 
-<input type="text" name="data"/><br/>
-<pre>{{data}}</pre>
+  Stored:
+  <input type="text" name="data"/><br/>
+  <pre>{{data}}</pre>
+ </doc:source>
+ <doc:scenario>
+  it('should store reverse', function(){
+   expect(element('.doc-example input:first').val()).toEqual('angular');
+   expect(element('.doc-example input:last').val()).toEqual('RALUGNA');
 
+   this.addFutureAction('change to XYZ', function($window, $document, done){
+     $document.elements('.doc-example input:last').val('XYZ').trigger('change');
+     done();
+   });
+   expect(element('.doc-example input:first').val()).toEqual('zyx');
+  });
+ </doc:scenario>
+</doc:example>
 
-@scenario
-it('should store reverse', function(){
- expect(element('.doc-example input:first').val()).toEqual('angular');
- expect(element('.doc-example input:last').val()).toEqual('RALUGNA');
- 
- this.addFutureAction('change to XYZ', function($window, $document, done){
-   $document.elements('.doc-example input:last').val('XYZ').trigger('change');
-   done();
- });
- expect(element('.doc-example input:first').val()).toEqual('zyx');
-});

docs/angular.markup.ngdoc

@@ -0,0 +1,66 @@
+@workInProgress
+@ngdoc overview
+@name angular.markup
+
+@description
+#Overview
+Markups allow the angular compiler to transform content of DOM elements or portions of this content
+into other text or DOM elements for further compilation. Markup extensions do not themselves produce
+linking functions. Think of markup as a way to produce shorthand for a {@link angular.widget widget}
+ or a {@link angular.directive directive}.
+
+#`{{}}` (double curly) built-in markup
+`{{}}` markup is a built-in markup, which translates the enclosed expression into an
+{@link angular.directive.ng:bind ng:bind} directive. It simply transforms
+
+<pre>
+{{expression}}
+</pre>
+
+to:
+
+<pre>
+<span ng:bind="expression"></span>
+</pre>
+
+For example `{{1+2}}` is easier to write and understand than `<span ng:bind="1+2"></span>`. The
+expanded elements are then {@link guide.compiler compiled} normally.
+
+# Custom markup
+Let's say you want to define this shorthand for a horizontal rule: `---` for `<hr/>`.
+
+In other words, this HTML:
+<pre>
+header
+---
+footer
+</pre>
+
+should translate to:
+<pre>
+header
+<hr/>
+footer
+</pre>
+
+Here's how the angular compiler could be extended to achieve this:
+<pre>
+angular.markup('---', function(text, textNode, parentElement) {
+  var compiler = this;
+  var index = text.indexOf('---');
+  if (index > -1) {
+    var before = compiler.text(text.substring(0, index));
+    var hr = compiler.element('hr');
+    var after = compiler.text(text.substring(index + 3));
+    textNode.after(after);
+    textNode.after(hr);
+    textNode.after(before);
+    textNode.remove();
+  }
+});
+</pre>
+
+Unlike {@link angular.widget widgets} and {@link angular.directive directives}, in which the
+compiler matches the name of handler function to a DOM element or attribute name, for markup the
+compiler calls every markup handler for every text node, giving the handler a chance to transform
+the text. The markup handler needs to find all the matches in the text.

docs/angular.service.ngdoc

@@ -4,53 +4,60 @@
 
 @description
 # Overview
-Services are substituable objects, which are wired together using dependency injection.
+Services are substituable objects, which are wired together using dependency injection (DI).
 Each service could have dependencies (other services), which are passed in constructor.
 Because JS is dynamicaly typed language, dependency injection can not use static types
-to satisfy these dependencies, so each service must explicitely define its dependencies.
+to identify these dependencies, so each service must explicitely define its dependencies.
 This is done by `$inject` property.
 
-For now, life time of all services is the same as the life time of page.
-
 
 # Built-in services
-The Angular framework provides a standard set of services for common operations.
-You can write your own services and rewrite these standard services as well.
-Like other core angular variables, the built-in services always start with $.
+angular provides a set of services for common operations. These services can be overriden by custom
+services if needed.
 
-  * `angular.service.$browser`
-  * `angular.service.$window`
-  * `angular.service.$document`
-  * `angular.service.$location`
-  * `angular.service.$log`
-  * `angular.service.$exceptionHandler`
-  * `angular.service.$hover`
-  * `angular.service.$invalidWidgets`
-  * `angular.service.$route`
-  * `angular.service.$xhr`
-  * `angular.service.$xhr.error`
-  * `angular.service.$xhr.bulk`
-  * `angular.service.$xhr.cache`
-  * `angular.service.$resource`
-  * `angular.service.$cookies`
-  * `angular.service.$cookieStore`
+Like other core angular variables and identifiers, the built-in services always start with `$`.
+
+  * {@link angular.service.$browser $browser}
+  * {@link angular.service.$window $window}
+  * {@link angular.service.$document $document}
+  * {@link angular.service.$location $location}
+  * {@link angular.service.$log $log}
+  * {@link angular.service.$exceptionHandler $exceptionHandler}
+  * {@link angular.service.$hover $hover}
+  * {@link angular.service.$invalidWidgets $invalidWidgets}
+  * {@link angular.service.$route $route}
+  * {@link angular.service.$xhr $xhr}
+  * {@link angular.service.$xhr.error $xhr.error}
+  * {@link angular.service.$xhr.bulk $xhr.bulk}
+  * {@link angular.service.$xhr.cache $xhr.cache}
+  * {@link angular.service.$resource $resource}
+  * {@link angular.service.$cookies $cookies}
+  * {@link angular.service.$cookieStore $cookieStore}
 
 # Writing your own custom services
-Angular provides only set of basic services, so you will probably need to write your custom
-service very soon. To do so, you need to write a factory function and register this function
-to angular's dependency injector. This factory function must return an object - your service
-(it is not called with new operator).
+angular provides only set of basic services, so for any nontrivial application it will be necessary
+to write one or more custom services. To do so, a factory function that creates a services needs to
+be registered with angular's dependency injector. This factory function must return an object - the
+service (it is not called with the `new` operator).
 
-**angular.service** has three parameters:
+**angular.service** accepts three parameters:
 
-  - `{string} name` - Name of the service
-  - `{function()} factory` - Factory function (called just once by DI)
-  - `{Object} config` -  Hash of configuration (`$inject`, `$creation`)
+  - `{string} name` - Name of the service.
+  - `{function()} factory` - Factory function (called just once by DI).
+  - `{Object} config` -  Configuration object with following properties:
+    - `$inject` - {Array.<string>} - Array of service ids that this service depends on. These
+      services will be passed as arguments into the factory function in the same order as specified
+      in the `$inject` array. Defaults to `[]`.
+    - `$eager` - {boolean} - If true, the service factory will be called and thus, the service will
+      be instantiated when angular boots. If false, service will be lazily instantiated when it is
+      first requested during instantiation of a dependant. Defaults to `false`.
 
-If your service requires - depends on other services, you need to specify them 
-in config hash - property $inject. This property is an array of strings (service names).
-These dependencies will be passed as parameters to the factory function by DI.
-This approach is very useful when testing, as you can inject mocks/stubs/dummies.
+The `this` of the factory function is bound to the root scope of the angular application.
+
+angular enables services to participate in dependency injection (DI) by registering themselves with
+angular's DI system (injector) under a `name` (id) as well as by declaring dependencies which need
+to be provided for the factory function of the registered service. The ability to swap dependencies
+for mocks/stubs/dummies in tests allows for services to be highly testable.
 
 Here is an example of very simple service. This service requires $window service (it's
 passed as a parameter to factory function) and it's just a function.
@@ -69,7 +76,7 @@ window alert.
          };
        }, {$inject: ['$window']});
 </pre>
- 
+
 And here is a unit test for this service. We use Jasmine spy (mock) instead of real browser's alert.
 <pre>
 var mock, notify;
@@ -78,7 +85,7 @@ beforeEach(function() {
   mock = {alert: jasmine.createSpy()};
   notify = angular.service('notify')(mock);
 });
- 
+
 it('should not alert first two notifications', function() {
   notify('one');
   notify('two');
@@ -105,8 +112,8 @@ it('should clear messages after alert', function() {
 </pre>
 
 # Injecting services into controllers
-Using services in a controllers is very similar to using service in other service.
-Again, we will use dependency injection.
+Using services as dependencies for controllers is very similar to using them as dependencies for
+another service.
 
 JavaScript is dynamic language, so DI is not able to figure out which services to inject by
 static types (like in static typed languages). Therefore you must specify the service name
@@ -127,33 +134,42 @@ function myController($loc, $log) {
   };
 }
 // which services to inject ?
-myController.$inject = ['$location', '$log']; 
+myController.$inject = ['$location', '$log'];
 </pre>
 
 @example
-<script type="text/javascript">
- angular.service('notify', function(win) {
-   var msgs = [];
-   return function(msg) {
-     msgs.push(msg);
-     if (msgs.length == 3) {
-       win.alert(msgs.join("\n"));
-       msgs = [];
-     }
-   };
- }, {$inject: ['$window']});
- 
- function myController(notifyService) {
-   this.callNotify = function(msg) {
-     notifyService(msg);
-   };
- }
- 
- myController.$inject = ['notify'];
-</script>
+<doc:example>
+ <doc:source>
+  <script type="text/javascript">
+   angular.service('notify', function(win) {
+     var msgs = [];
+     return function(msg) {
+       msgs.push(msg);
+       if (msgs.length == 3) {
+         win.alert(msgs.join("\n"));
+         msgs = [];
+       }
+     };
+   }, {$inject: ['$window']});
 
-<div ng:controller="myController">
-<p>Let's try this simple notify service, injected into the controller...</p>
-<input ng:init="message='test'" type="text" name="message" />
-<button ng:click="callNotify(message);">NOTIFY</button>
-</div>
+   function myController(notifyService) {
+     this.callNotify = function(msg) {
+       notifyService(msg);
+     };
+   }
+
+   myController.$inject = ['notify'];
+  </script>
+
+  <div ng:controller="myController">
+  <p>Let's try this simple notify service, injected into the controller...</p>
+  <input ng:init="message='test'" type="text" name="message" />
+  <button ng:click="callNotify(message);">NOTIFY</button>
+  </div>
+ </doc:source>
+ <doc:scenario>
+   it('should test service', function(){
+     expect(element(':input[name=message]').val()).toEqual('test');
+   });
+ </doc:scenario>
+</doc:example>

docs/angular.validator.ngdoc

@@ -4,7 +4,7 @@
 @namespace Namespace for all filters.
 @description
 # Overview
-Validators are a standard way to check the user input against a specific criteria. For 
+Validators are a standard way to check the user input against a specific criteria. For
 example, you might need to check that an input field contains a well-formed phone number.
 
 # Syntax
@@ -12,7 +12,7 @@ Attach a validator on user input widgets using the `ng:validate` attribute.
 
 <doc:example>
   <doc:source>
-    Change me: &lt;input type="text" name="number" ng:validate="integer" value="123"&gt;
+    Change me: <input type="text" name="number" ng:validate="integer" value="123">
   </doc:source>
   <doc:scenario>
     it('should validate the default number string', function() {
@@ -29,10 +29,10 @@ Attach a validator on user input widgets using the `ng:validate` attribute.
 
 
 # Writing your own Validators
-Writing your own validator is easy. To make a function available as a 
-validator, just define the JavaScript function on the `angular.validator` 
-object. <angular/> passes in the input to validate as the first argument 
-to your function. Any additional validator arguments are passed in as 
+Writing your own validator is easy. To make a function available as a
+validator, just define the JavaScript function on the `angular.validator`
+object. <angular/> passes in the input to validate as the first argument
+to your function. Any additional validator arguments are passed in as
 additional arguments to your function.
 
 You can use these variables in the function:
@@ -40,9 +40,9 @@ You can use these variables in the function:
 * `this` — The current scope.
 * `this.$element` — The DOM element containing the binding. This allows the filter to manipulate
   the DOM in addition to transforming the input.
-  
-In this example we have written a upsTrackingNo validator. 
-It marks the input text "valid" only when the user enters a well-formed 
+
+In this example we have written a upsTrackingNo validator.
+It marks the input text "valid" only when the user enters a well-formed
 UPS tracking number.
 
 @css ng-validation-error
@@ -50,24 +50,28 @@ UPS tracking number.
   default.
 
 @example
-<script>
- angular.validator('upsTrackingNo', function(input, format) {
-   var regexp = new RegExp("^" + format.replace(/9/g, '\\d') + "$");
-   return input.match(regexp)?"":"The format must match " + format;
- });
-</script>
-<input type="text" name="trackNo" size="40"
-      ng:validate="upsTrackingNo:'1Z 999 999 99 9999 999 9'" 
-      value="1Z 123 456 78 9012 345 6"/>
+<doc:example>
+ <doc:source>
+  <script>
+   angular.validator('upsTrackingNo', function(input, format) {
+     var regexp = new RegExp("^" + format.replace(/9/g, '\\d') + "$");
+     return input.match(regexp)?"":"The format must match " + format;
+   });
+  </script>
+  <input type="text" name="trackNo" size="40"
+        ng:validate="upsTrackingNo:'1Z 999 999 99 9999 999 9'"
+        value="1Z 123 456 78 9012 345 6"/>
+ </doc:source>
+ <doc:scenario>
+  it('should validate correct UPS tracking number', function() {
+    expect(element('input[name=trackNo]').attr('class')).
+       not().toMatch(/ng-validation-error/);
+  });
 
-@scenario
-it('should validate correct UPS tracking number', function() {
-  expect(element('input[name=trackNo]').attr('class')).
-     not().toMatch(/ng-validation-error/);
-});
-
-it('should not validate in correct UPS tracking number', function() {
-  input('trackNo').enter('foo');
-  expect(element('input[name=trackNo]').attr('class')).
-     toMatch(/ng-validation-error/);
-});
+  it('should not validate in correct UPS tracking number', function() {
+    input('trackNo').enter('foo');
+    expect(element('input[name=trackNo]').attr('class')).
+       toMatch(/ng-validation-error/);
+  });
+ </doc:scenario>
+</doc:example>

docs/angular.widget.ngdoc

@@ -4,19 +4,19 @@
 @namespace Namespace for all widgets.
 @description
 # Overview
-Widgets allow you to create DOM elements that the browser doesn't 
-already understand. You create the widget in your namespace and 
-assign it behavior. You can only bind one widget per DOM element 
-(unlike directives, in which you can use any number per DOM 
-element). Widgets are expected to manipulate the DOM tree by 
+Widgets allow you to create DOM elements that the browser doesn't
+already understand. You create the widget in your namespace and
+assign it behavior. You can only bind one widget per DOM element
+(unlike directives, in which you can use any number per DOM
+element). Widgets are expected to manipulate the DOM tree by
 adding new elements whereas directives are expected to only modify
 element properties.
 
 Widgets come in two flavors: element and attribute.
 
 # Element Widget
-Let's say we would like to create a new element type in the 
-namespace `my` that can watch an expression and alert() the user 
+Let's say we would like to create a new element type in the
+namespace `my` that can watch an expression and alert() the user
 with each new value.
 
 <pre>
@@ -38,7 +38,7 @@ angular.widget('my:watch', function(compileElement) {
 </pre>
 
 # Attribute Widget
-Let's implement the same widget, but this time as an attribute 
+Let's implement the same widget, but this time as an attribute
 that can be added to any existing DOM element.
 <pre>
 &lt;div my-watch="name"&gt;text&lt;/div&gt;
@@ -57,17 +57,22 @@ angular.widget('@my:watch', function(expression, compileElement) {
 </pre>
 
 @example
-<script>
-  angular.widget('my:time', function(compileElement){
-    compileElement.css('display', 'block');
-    return function(linkElement){
-      function update(){
-        linkElement.text('Current time is: ' + new Date());
-        setTimeout(update, 1000);
-      }
-      update();
-    };
-  });
-</script>
-<my:time></my:time>
-     
+<doc:example>
+ <doc:source>
+  <script>
+    angular.widget('my:time', function(compileElement){
+      compileElement.css('display', 'block');
+      return function(linkElement){
+        function update(){
+          linkElement.text('Current time is: ' + new Date());
+          setTimeout(update, 1000);
+        }
+        update();
+      };
+    });
+  </script>
+  <my:time></my:time>
+ </doc:source>
+ <doc:scenario>
+ </doc:scenario>
+</doc:example>

docs/collect.js

@@ -1,440 +0,0 @@
-require.paths.push("./lib");
-require.paths.push(__dirname);
-var fs       = require('fs'),
-    spawn    = require('child_process').spawn,
-    mustache = require('mustache'),
-    callback = require('callback'),
-    Showdown = require('showdown').Showdown;
-
-var documentation = {
-    pages:[],
-    byName: {}
-};
-var keywordPages = [];
-
-
-var SRC_DIR = "docs/";
-var OUTPUT_DIR = "build/docs/";
-var NEW_LINE = /\n\r?/;
-var TEMPLATES = {};
-var start = now();
-
-function now(){ return new Date().getTime(); }
-var work = callback.chain(function () {
-  console.log('Parsing Angular Reference Documentation');
-  findJsFiles('src', work.waitMany(function(file) {
-    //console.log('reading', file, '...');
-    findNgDocInJsFile(file, work.waitMany(function(doc) {
-      parseNgDoc(doc);
-      processNgDoc(documentation, doc);
-    }));
-  }));
-  findNgDocInDir(SRC_DIR, work.waitMany(function(doc){
-    parseNgDoc(doc);
-    processNgDoc(documentation, doc);
-  }));
-  loadTemplates(TEMPLATES, work.waitFor());
-  mkdirPath(OUTPUT_DIR, work.waitFor());
-}).onError(function(err){
-  console.log('ERROR:', err.stack || err);
-}).onDone(function(){
-  keywordPages.sort(keywordSort);
-  writeDoc(documentation.pages);
-  mergeTemplate('docs-data.js', 'docs-data.js', {JSON:JSON.stringify(keywordPages)}, callback.chain());
-  mergeTemplate('docs-scenario.js', 'docs-scenario.js', documentation, callback.chain());
-  copy('docs-scenario.html', callback.chain());
-  copy('index.html', callback.chain());
-  copy('docs.css', callback.chain());
-  mergeTemplate('docs.js', 'docs.js', documentation, callback.chain());
-  mergeTemplate('doc_widgets.css', 'doc_widgets.css', documentation, callback.chain());
-  mergeTemplate('doc_widgets.js', 'doc_widgets.js', documentation, callback.chain());
-  console.log('DONE', now() - start, 'ms.');
-});
-if (!this.testmode) work();
-////////////////////
-
-function keywords(text){
-  var keywords = {};
-  var words = [];
-  var tokens = text.toLowerCase().split(/[,\.\`\'\"\s]+/mg);
-  tokens.forEach(function(key){
-    var match = key.match(/^(([a-z]|ng\:)[\w\_\-]{2,})/);
-    if (match){
-      key = match[1];
-      if (!keywords[key]) {
-        keywords[key] = true;
-        words.push(key);
-      }
-    }
-  });
-  words.sort();
-  return words.join(' ');
-}
-
-function noop(){}
-function mkdirPath(path, callback) {
-  var parts = path.split(/\//);
-  path = '.';
-  (function next(){
-    if (parts.length) {
-      path += '/' + parts.shift();
-      fs.mkdir(path, 0777, next);
-    } else {
-      callback();
-    }
-  })();
-}
-
-function copy(name, callback){
-  fs.readFile(SRC_DIR + name, callback.waitFor(function(err, content){
-    if (err) return this.error(err);
-    fs.writeFile(OUTPUT_DIR + name, content, callback);
-  }));
-}
-
-function mergeTemplate(template, output, doc, callback){
-  fs.readFile(SRC_DIR + template,
-    callback.waitFor(function(err, template){
-      if (err) return this.error(err);
-      var content = mustache.to_html(template.toString(), doc);
-      fs.writeFile(OUTPUT_DIR + output, content, callback);
-    }));
-}
-
-
-function trim(text) {
-  var MAX = 9999;
-  var empty = RegExp.prototype.test.bind(/^\s*$/);
-  var lines = text.split('\n');
-  var minIndent = MAX;
-  lines.forEach(function(line){
-    minIndent = Math.min(minIndent, indent(line));
-  });
-  for ( var i = 0; i < lines.length; i++) {
-    lines[i] = lines[i].substring(minIndent);
-  }
-  // remove leading lines
-  while (empty(lines[0])) {
-    lines.shift();
-  }
-  // remove trailing
-  while (empty(lines[lines.length - 1])) {
-    lines.pop();
-  }
-  return lines.join('\n');
-  
-  function indent(line) {
-    for(var i = 0; i < line.length; i++) {
-      if (line.charAt(i) != ' ')  {
-        return i;
-      }
-    }
-    return MAX;
-  }
-}
-
-function unknownTag(doc, name) {
-  var error = "[" + doc.raw.file + ":" + doc.raw.line + "]: unknown tag: " + name;
-  console.log(error);
-  throw new Error(error);
-}
-
-function valueTag(doc, name, value) {
-  doc[name] = value;
-}
-
-function escapedHtmlTag(doc, name, value) {
-  doc[name] = value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-}
-
-function markdownTag(doc, name, value) {
-  doc[name] = markdown(value.replace(/^#/gm, '##')).
-    replace(/\<pre\>/gmi, '<div ng:non-bindable><pre class="brush: js; html-script: true;">').
-    replace(/\<\/pre\>/gmi, '</pre></div>');
-}
-
-var R_LINK = /{@link ([^\s}]+)((\s|\n)+(.+?))?\s*}/m;
-        //       1       123     3 4     42
-
-function markdown(text) {
-  var parts = text.split(/(<pre>[\s\S]*?<\/pre>)/),
-      match;
-
-  parts.forEach(function(text, i){
-    if (!text.match(/^<pre>/)) {
-      text = text.replace(/<angular\/>/gm, '<tt>&lt;angular/&gt;</tt>');
-      text = new Showdown.converter().makeHtml(text);
-
-      while (match = text.match(R_LINK)) {
-        text = text.replace(match[0], '<a href="#!' + match[1] + '"><code>' +
-                                        (match[4] || match[1]) +
-                                      '</code></a>');
-      }
-
-      parts[i] = text;
-    }
-  });
-  return parts.join('');
-}
-
-function markdownNoP(text) {
-  var lines = markdown(text).split(NEW_LINE);
-  var last = lines.length - 1;
-  lines[0] = lines[0].replace(/^<p>/, '');
-  lines[last] = lines[last].replace(/<\/p>$/, '');
-  return lines.join('\n');
-}
-
-function requiresTag(doc, name, value) {
-  doc.requires = doc.requires || [];
-  doc.requires.push({name: value});
-}
-
-function propertyTag(doc, name, value) {
-  doc[name] = doc[name] || [];
-  var match = value.match(/^({(\S+)}\s*)?(\S+)(\s+(.*))?/);
-  
-  if (match) {
-    var tag = {
-      type: match[2],
-      name: match[3],
-      description: match[5] || false
-    };
-  } else {
-    throw "[" + doc.raw.file + ":" + doc.raw.line +
-          "]: @" + name + " must be in format '{type} name description' got: " + value;
-  }
-  return doc[name].push(tag);
-}
-
-function returnsTag(doc, name, value) {
-  var match = value.match(/^{(\S+)}\s+([\s\S]*)?/);
-  
-  if (match) {
-    var tag = {
-      type: match[1],
-      description: markdownNoP(match[2]) || false
-    };
-  } else {
-    throw "[" + doc.raw.file + ":" + doc.raw.line +
-          "]: @" + name + " must be in format '{type} description' got: " + value;
-  }
-  return doc[name] = tag;
-}
-
-var TAG = {
-  ngdoc: valueTag,
-  example: escapedHtmlTag,
-  scenario: valueTag,
-  namespace: valueTag,
-  css: valueTag,
-  see: valueTag,
-  deprecated: valueTag,
-  workInProgress: function(doc, name, value) {
-    doc[name] = {description: markdown(value)};
-  },
-  usageContent: valueTag,
-  'function': valueTag,
-  description: markdownTag,
-  TODO: markdownTag,
-  paramDescription: markdownTag,
-  exampleDescription: markdownTag,
-  element: valueTag,
-  methodOf: valueTag,
-  name: function(doc, name, value) {
-    var parts = value.split(/\./);
-    doc.name = value;
-    doc.shortName  = parts.pop();
-    doc.depth = parts.length;
-  },
-  param: function(doc, name, value){
-    doc.param = doc.param || [];
-    doc.paramRest = doc.paramRest || [];
-    var match = value.match(/^{([^}=]+)(=)?}\s+(([^\s=]+)|\[(\S+)=([^\]]+)\])\s+(.*)/);
-                           //  1      12 2     34       4   5   5 6      6  3   7  7
-    if (match) {
-      var param = {
-          type: match[1],
-          name: match[5] || match[4],
-          optional: !!match[2],
-          'default':match[6],
-          description:markdownNoP(value.replace(match[0], match[7]))
-        };
-      doc.param.push(param);
-      if (!doc.paramFirst) {
-        doc.paramFirst = param;
-      } else {
-        doc.paramRest.push(param);
-      }
-    } else {
-      throw "[" + doc.raw.file + ":" + doc.raw.line +
-            "]: @param must be in format '{type} name=value description' got: " + value;
-    }
-  },
-  property: propertyTag,
-  requires: requiresTag,
-  returns: returnsTag
-};
-
-function parseNgDoc(doc){
-  var atName;
-  var atText;
-  var match;
-  doc.raw.text.split(NEW_LINE).forEach(function(line, lineNumber){
-    if (match = line.match(/^\s*@(\w+)(\s+(.*))?/)) {
-      // we found @name ...
-      // if we have existing name
-      if (atName) {
-        (TAG[atName] || unknownTag)(doc, atName, trim(atText.join('\n')));
-      }
-      atName = match[1];
-      atText = [];
-      if(match[3]) atText.push(match[3]);
-    } else {
-      if (atName) {
-        atText.push(line);
-      } else {
-        // ignore
-      }
-    }
-  });
-  if (atName) {
-    (TAG[atName] || unknownTag)(doc, atName, atText.join('\n'));
-  }
-}
-
-function findNgDocInJsFile(file, callback) {
-  fs.readFile(file, callback.waitFor(function(err, content){
-    var lines = content.toString().split(NEW_LINE);
-    var doc;
-    var match;
-    var inDoc = false;
-    lines.forEach(function(line, lineNumber){
-      lineNumber++;
-      // is the comment starting?
-      if (!inDoc && (match = line.match(/^\s*\/\*\*\s*(.*)$/))) {
-        line = match[1];
-        inDoc = true;
-        doc = {raw:{file:file, line:lineNumber, text:[]}};
-      }
-      // are we done?
-      if (inDoc && line.match(/\*\//)) {
-        doc.raw.text = doc.raw.text.join('\n');
-        doc.raw.text = doc.raw.text.replace(/^\n/, '');
-        if (doc.raw.text.match(/@ngdoc/)){
-          callback(doc);
-        }
-        doc = null;
-        inDoc = false;
-      }
-      // is the comment add text
-      if (inDoc){
-        doc.raw.text.push(line.replace(/^\s*\*\s?/, ''));
-      }
-    });
-    callback.done();
-  }));
-}
-
-function loadTemplates(cache, callback){
-  fs.readdir('docs', callback.waitFor(function(err, files){
-    if (err) return this.error(err);
-    files.forEach(function(file){
-      var match = file.match(/^(.*)\.template$/);
-      if (match) {
-        fs.readFile(SRC_DIR + file, callback.waitFor(function(err, content){
-          if (err) return this.error(err);
-          cache[match[1]] = content.toString();
-        }));
-      }
-    });
-    callback();
-  }));
-};
-
-function findJsFiles(dir, callback){
-  fs.readdir(dir, callback.waitFor(function(err, files){
-    if (err) return this.error(err);
-    files.forEach(function(file){
-      var path = dir + '/' + file;
-      fs.lstat(path, callback.waitFor(function(err, stat){
-        if (err) return this.error(err);
-        if (stat.isDirectory())
-          findJsFiles(path, callback.waitMany(callback));
-        else if (/\.js$/.test(path))
-          callback(path);
-      }));
-    });
-    callback.done();
-  }));
-}
-
-function processNgDoc(documentation, doc) {
-  if (!doc.ngdoc) return;
-  //console.log('Found:', doc.ngdoc + ':' + doc.name);
-  
-  documentation.byName[doc.name] = doc;
-  
-  if (doc.methodOf) {
-    if (parent = documentation.byName[doc.methodOf]) {
-      (parent.method = parent.method || []).push(doc);
-    } else {
-      throw 'Owner "' + doc.methodOf + '" is not defined.';
-    }
-  } else {
-    documentation.pages.push(doc);
-    keywordPages.push({
-      name:doc.name,
-      type: doc.ngdoc,
-      keywords:keywords(doc.raw.text)
-    });
-  }
-}
-
-function writeDoc(pages, callback) {
-  pages.forEach(function(doc) {
-    var template = TEMPLATES[doc.ngdoc];
-    if (!template) throw new Error("No template for:" + doc.ngdoc);
-    var content = mustache.to_html(template, doc);
-    fs.writeFile(OUTPUT_DIR + doc.name + '.html', content, callback);
-  });
-}
-
-function findNgDocInDir(directory, docNotify) {
-  fs.readdir(directory, docNotify.waitFor(function(err, files){
-    if (err) return this.error(err);
-    files.forEach(function(file){
-      console.log(file);
-      if (!file.match(/\.ngdoc$/)) return;
-      fs.readFile(directory + file, docNotify.waitFor(function(err, content){
-        if (err) return this.error(err);
-        docNotify({
-          raw:{
-            text:content.toString(),
-            file: directory + file,
-            line: 1}
-          });
-      }));
-    });
-    docNotify.done();
-  }));
-}
-
-function keywordSort(a,b){
-  // supper ugly comparator that orders all utility methods and objects before all the other stuff
-  // like widgets, directives, services, etc.
-  // Mother of all beautiful code please forgive me for the sin that this code certainly is.
-
-  if (a.name === b.name) return 0;
-  if (a.name === 'angular') return -1;
-  if (b.name === 'angular') return 1;
-
-  function namespacedName(page) {
-    return (page.name.match(/\./g).length === 1 && page.type !== 'overview' ? '0' : '1') + page.name;
-  }
-
-  var namespacedA = namespacedName(a),
-      namespacedB = namespacedName(b);
-
-  return namespacedA < namespacedB ? -1 : 1;
-}

docs/cookbook.buzz.ngdoc

@@ -0,0 +1,63 @@
+@workInProgress
+@ngdoc overview
+@name Cookbook: Resources - Buzz
+@description
+
+External resources are URLs that provide JSON data, which are then rendered with the help of
+templates. angular has a resource factory that can be used to give names to the URLs and then
+attach behavior to them. For example you can use the
+{@link http://code.google.com/apis/buzz/v1/getting_started.html#background-operations| Google Buzz API}
+to retrieve Buzz activity and comments.
+
+<doc:example>
+ <doc:source>
+    <script>
+    BuzzController.$inject = ['$resource'];
+    function BuzzController($resource){
+     this.Activity = $resource(
+      'https://www.googleapis.com/buzz/v1/activities/:userId/:visibility/:activityId/:comments',
+      {alt:'json', callback:'JSON_CALLBACK'},
+      { get:     {method:'JSON', params:{visibility:'@self'}},
+       replies: {method:'JSON', params:{visibility:'@self', comments:'@comments'}}
+      });
+    }
+    BuzzController.prototype = {
+     fetch: function(){
+      this.activities = this.Activity.get({userId:this.userId});
+     },
+     expandReplies: function(activity) {
+      activity.replies =
+       this.Activity.replies({userId:this.userId, activityId:activity.id});
+     }
+    };
+    </script>
+    <div ng:controller="BuzzController">
+     <input name="userId" value="googlebuzz"/>
+     <button ng:click="fetch()">fetch</button>
+     <hr/>
+     <div class="buzz" ng:repeat="item in activities.data.items">
+      <h1 style="font-size: 15px;">
+       <img src="{{item.actor.thumbnailUrl}}" style="max-height:30px;max-width:30px;"/>
+       <a href="{{item.actor.profileUrl}}">{{item.actor.name}}</a>
+       <a href="" ng:click="expandReplies(item)" style="float: right;">
+        Expand replies: {{item.links.replies[0].count}}
+       </a>
+      </h1>
+      {{item.object.content | html}}
+      <div class="reply" ng:repeat="reply in item.replies.data.items" style="margin-left: 20px;">
+       <img src="{{reply.actor.thumbnailUrl}}" style="max-height:30px;max-width:30px;"/>
+       <a href="{{reply.actor.profileUrl}}">{{reply.actor.name}}</a>:
+       {{reply.content | html}}
+      </div>
+     </div>
+    </div>
+ </doc:source>
+ <doc:scenario>
+  it('fetch buzz and expand', function(){
+    element(':button:contains(fetch)').click();
+    expect(repeater('div.buzz').count()).toBeGreaterThan(0);
+    element('.buzz a:contains(Expand replies):first').click();
+    expect(repeater('div.reply').count()).toBeGreaterThan(0);
+  });
+ </doc:scenario>
+</doc:example>

docs/cookbook.deeplinking.ngdoc

@@ -0,0 +1,114 @@
+@workInProgress
+@ngdoc overview
+@name Cookbook: Deep Linking
+@description
+
+Deep linking allows you to encode the state of the application in the URL so that it can be
+bookmarked and the application can be restored from the URL to the same state.
+
+While <angular/> does not force you to deal with bookmarks in any particular way, it has services
+which make the common case described here very easy to implement.
+
+# Assumptions
+
+Your application consists of a single HTML page which bootstraps the application. We will refer
+to this page as the chrome.
+Your application is divided into several screens (or views) which the user can visit. For example,
+the home screen, settings screen, details screen, etc. For each of these screens, we would like to
+assign a URL so that it can be bookmarked and later restored. Each of these screens will be
+associated with a controller which define the screen's behavior. The most common case is that the
+screen will be constructed from an HTML snippet, which we will refer to as the partial. Screens can
+have multiple partials, but a single partial is the most common construct. This example makes the
+partial boundary visible using a blue line.
+
+You can make a routing table which shows which URL maps to which partial view template and which
+controller.
+
+# Example
+
+In this example we have a simple app which consist of two screens:
+
+* Welcome: url `#` Show the user contact information.
+* Settings: url `#/settings` Show an edit screen for user contact information.
+
+
+The two partials are defined in the following URLs:
+
+* {@link ./static/settings.html}
+* {@link ./static/welcome.html}
+
+
+<doc:example>
+ <doc:source>
+    <script>
+     AppCntl.$inject = ['$route']
+     function AppCntl($route) {
+      // define routes
+      $route.when("",          {template:'./static/welcome.html',  controller:WelcomeCntl});
+      $route.when("/settings", {template:'./static/settings.html', controller:SettingsCntl});
+      $route.parent(this);
+
+      // initialize the model to something useful
+      this.person = {
+       name:'anonymous',
+       contacts:[{type:'email', url:'anonymous@example.com'}]
+      };
+     }
+
+     function WelcomeCntl($route){}
+     WelcomeCntl.prototype = {
+      greet: function(){
+       alert("Hello " + this.person.name);
+      }
+     };
+
+     function SettingsCntl(){
+      this.cancel();
+     }
+     SettingsCntl.prototype = {
+      cancel: function(){
+       this.form = angular.copy(this.person);
+      },
+
+      save: function(){
+       angular.copy(this.form, this.person);
+       window.location.hash = "#";
+      }
+     };
+    </script>
+    <div ng:controller="AppCntl">
+      <h1>Your App Chrome</h1>
+      [ <a href="#">Welcome</a> | <a href="#/settings">Settings</a> ]
+      <hr/>
+      <span style="background-color: blue; color: white; padding: 3px;">
+        Partial: {{$route.current.template}}
+      </span>
+      <ng:view style="border: 1px solid blue; margin: 0; display:block; padding:1em;"></ng:view>
+      <small>Your app footer </small>
+    </div>
+ </doc:source>
+ <doc:scenario>
+   it('should navigate to URL', function(){
+    element('a:contains(Welcome)').click();
+    expect(element('ng\\:view').text()).toMatch(/Hello anonymous/);
+    element('a:contains(Settings)').click();
+    input('form.name').enter('yourname');
+    element(':button:contains(Save)').click();
+    element('a:contains(Welcome)').click();
+    expect(element('ng\\:view').text()).toMatch(/Hello yourname/);
+   });
+ </doc:scenario>
+</doc:example>
+
+
+
+# Things to notice
+
+* Routes are defined in the `AppCntl` class. The initialization of the controller causes the
+  initialization of the {@link angular.service.$rouet $route} service with the proper URL routes.
+* The  {@link angular.service.$route $route} service then watches the URL and instantiates the
+  appropriate controller when the URL changes.
+* The  {@link angular.widget.ng:view ng:view} widget loads the view when the URL changes. It also
+  sets the view scope to the newly instantiated controller.
+* Changing the URL is sufficient to change the controller and view. It makes no difference whether
+  the URL is changed programatically or by the user.

docs/cookbook.form.ngdoc

@@ -0,0 +1,103 @@
+@workInProgress
+@ngdoc overview
+@name Cookbook: Form
+@description
+
+A web application's main purpose is to present and gather data. For this reason angular strives
+to make both of these operations trivial. This example shows off how you can build a simple form to
+allow a user to enter data.
+
+
+<doc:example>
+ <doc:source>
+  <script>
+    function FormController(){
+      this.user = {
+        name: 'John Smith',
+        address:{line1: '123 Main St.', city:'Anytown', state:'AA', zip:'12345'},
+        contacts:[{type:'phone', value:'1(234) 555-1212'}]
+      };
+      this.state = /^\w\w$/;
+      this.zip = /^\d\d\d\d\d$/;
+    }
+  </script>
+  <div ng:controller="FormController" class="example">
+
+    <label>Name:</label><br/>
+    <input type="text" name="user.name" ng:required/> <br/><br/>
+
+    <label>Address:</label><br/>
+    <input type="text" name="user.address.line1" size="33" ng:required/> <br/>
+    <input type="text" name="user.address.city" size="12" ng:required/>,
+    <input type="text" name="user.address.state" size="2" ng:required ng:validate="regexp:state"/>
+    <input type="text" name="user.address.zip" size="5" ng:required ng:validate="regexp:zip"/><br/><br/>
+
+    <label>Phone:</label>
+    [ <a href="" ng:click="user.contacts.$add()">add</a> ]
+    <div ng:repeat="contact in user.contacts">
+      <select name="contact.type">
+        <option>email</option>
+        <option>phone</option>
+        <option>pager</option>
+        <option>IM</option>
+      </select>
+      <input type="text" name="contact.value" ng:required/>
+       [ <a href="" ng:click="user.contacts.$remove(contact)">X</a> ]
+    </div>
+    <hr/>
+    Debug View:
+    <pre>user={{user}}</pre>
+  </div>
+
+ </doc:source>
+ <doc:scenario>
+  it('should show debug', function(){
+    expect(binding('user')).toMatch(/John Smith/);
+  });
+  it('should add contact', function(){
+    using('.example').element('a:contains(add)').click();
+    using('.example div:last').input('contact.value').enter('you@example.org');
+    expect(binding('user')).toMatch(/\(234\) 555\-1212/);
+    expect(binding('user')).toMatch(/you@example.org/);
+  });
+
+  it('should remove contact', function(){
+    using('.example').element('a:contains(X)').click();
+    expect(binding('user')).not().toMatch(/\(234\) 555\-1212/);
+  });
+
+  it('should validate zip', function(){
+    expect(using('.example').element(':input[name=user.address.zip]').attr('className'))
+      .not().toMatch(/ng-validation-error/)
+
+    using('.example').input('user.address.zip').enter('abc');
+
+    expect(using('.example').element(':input[name=user.address.zip]').attr('className'))
+      .toMatch(/ng-validation-error/)
+  });
+
+  it('should validate state', function(){
+    expect(using('.example').element(':input[name=user.address.state]').attr('className'))
+      .not().toMatch(/ng-validation-error/)
+
+    using('.example').input('user.address.state').enter('XXX');
+
+    expect(using('.example').element(':input[name=user.address.state]').attr('className'))
+      .toMatch(/ng-validation-error/)
+  });
+ </doc:scenario>
+</doc:example>
+
+
+# Things to notice
+
+* The user data model is initialized {@link angular.ng:controller controller} and is available in
+  the {@link angular.scope scope} with the initial data.
+* For debugging purposes we have included a debug view of the model to better understand what
+  is going on.
+* The {@link angular.widget.HTML input widgets} simply refer to the model and are auto bound.
+* The inputs {@link angular.validator validate}. (Try leaving them blank or entering non digits
+  in the zip field)
+* In your application you can simply read from or write to the model and the form will be updated.
+* By clicking the 'add' link you are adding new items into the `user.contacts` array which are then
+  reflected in the view.

docs/cookbook.formadvanced.ngdoc

@@ -0,0 +1,101 @@
+@workInProgress
+@ngdoc overview
+@name Cookbook: Advanced Form
+@description
+
+Here we extend the basic form example to include common features such as reverting, dirty state
+detection, and preventing invalid form submission.
+
+<doc:example>
+ <doc:source>
+    <script>
+    function UserForm(){
+      this.state = /^\w\w$/;
+      this.zip = /^\d\d\d\d\d$/;
+      this.master = {
+        name: 'John Smith',
+        address:{
+          line1: '123 Main St.',
+          city:'Anytown',
+          state:'AA',
+          zip:'12345'
+        },
+        contacts:[
+          {type:'phone', value:'1(234) 555-1212'}
+        ]
+      };
+      this.cancel();
+    }
+
+    UserForm.prototype = {
+      cancel: function(){
+        this.form = angular.copy(this.master);
+      },
+
+      save: function(){
+        this.master = this.form;
+        this.cancel();
+      }
+    };
+    </script>
+    <div ng:controller="UserForm">
+
+      <label>Name:</label><br/>
+      <input type="text" name="form.name" ng:required/> <br/><br/>
+
+      <label>Address:</label><br/>
+      <input type="text" name="form.address.line1" size="33" ng:required/> <br/>
+      <input type="text" name="form.address.city" size="12" ng:required/>,
+      <input type="text" name="form.address.state" size="2" ng:required ng:validate="regexp:state"/>
+      <input type="text" name="form.address.zip" size="5" ng:required ng:validate="regexp:zip"/><br/><br/>
+
+      <label>Phone:</label>
+      [ <a href="" ng:click="form.contacts.$add()">add</a> ]
+      <div ng:repeat="contact in form.contacts">
+        <select name="contact.type">
+          <option>email</option>
+          <option>phone</option>
+          <option>pager</option>
+          <option>IM</option>
+        </select>
+        <input type="text" name="contact.value" ng:required/>
+         [ <a href="" ng:click="form.contacts.$remove(contact)">X</a> ]
+      </div>
+    <button ng:click="cancel()" disabled="{{master.$equals(form)}}">Cancel</button>
+    <button ng:click="save()" disabled="{{$invalidWidgets.visible() || master.$equals(form)}}">Save</button>
+
+    <hr/>
+    Debug View:
+    <pre>form={{form}}
+    master={{master}}</pre>
+    </div>
+ </doc:source>
+ <doc:scenario>
+  it('should enable save button', function(){
+    expect(element(':button:contains(Save)').attr('disabled')).toBeTruthy();
+    input('form.name').enter('change');
+    expect(element(':button:contains(Save)').attr('disabled')).toBeFalsy();
+    element(':button:contains(Save)').click();
+    expect(element(':button:contains(Save)').attr('disabled')).toBeTruthy();
+  });
+  it('should enable cancel button', function(){
+    expect(element(':button:contains(Cancel)').attr('disabled')).toBeTruthy();
+    input('form.name').enter('change');
+    expect(element(':button:contains(Cancel)').attr('disabled')).toBeFalsy();
+    element(':button:contains(Cancel)').click();
+    expect(element(':button:contains(Cancel)').attr('disabled')).toBeTruthy();
+    expect(element(':input[name=form.name]').val()).toEqual('John Smith');
+  });
+ </doc:scenario>
+</doc:example>
+
+
+#Things to notice
+
+* Cancel & save buttons are only enabled if the form is dirty -- there is something to cancel or
+  save.
+* Save button is only enabled if there are no validation errors on the form.
+* Cancel reverts the form changes back to original state.
+* Save updates the internal model of the form.
+* Debug view shows the two models. One presented to the user form and the other being the pristine
+  copy master.

docs/cookbook.helloworld.ngdoc

@@ -0,0 +1,31 @@
+@workInProgress
+@ngdoc overview
+@name Cookbook: Hello World
+@description
+
+<doc:example>
+ <doc:source>
+  Your name: <input type="text" name="name" value="World"/>
+  <hr/>
+  Hello {{name}}!
+ </doc:source>
+ <doc:scenario>
+   it('should change the binding when user enters text', function(){
+     expect(binding('name')).toEqual('World');
+     input('name').enter('angular');
+     expect(binding('name')).toEqual('angular');
+   });
+ </doc:scenario>
+</doc:example>
+
+# Things to notice
+
+Take a look through the source and note:
+
+* The script tag that {@link guide.bootstrap bootstraps} the angular environment.
+* The text {@link angular.widget.HTML input widget} which is bound to the greeting name text.
+* No need for listener registration and event firing on change events.
+* The implicit presence of the `name` variable which is in the root {@link angular.scope scope}.
+* The double curly brace `{{markup}}`, which binds the name variable to the greeting text.
+* The concept of {@link guide.data-binding data binding}, which reflects any changes to the
+  input field in the greeting text.

docs/cookbook.mvc.ngdoc

@@ -0,0 +1,125 @@
+@workInProgress
+@ngdoc overview
+@name Cookbook: MVC
+@description
+
+MVC allows for a clean an testable separation between the behavior (controller) and the view
+(HTML template). A Controller is just a JavaScript class which is grafted onto the scope of the
+view. This makes it very easy for the controller and the view to share the model.
+
+The model is simply the controller's this. This makes it very easy to test the controller in
+isolation since one can simply instantiate the controller and test without a view, because there is
+no connection between the controller and the view.
+
+
+<doc:example>
+ <doc:source>
+    <script>
+    function TicTacToeCntl(){
+      this.cellStyle= {
+        'height': '20px',
+        'width': '20px',
+        'border': '1px solid black',
+        'text-align': 'center',
+        'vertical-align': 'middle',
+        'cursor': 'pointer'
+      };
+      this.reset();
+      this.$watch('$location.hashSearch.board', this.readUrl);
+    }
+    TicTacToeCntl.prototype = {
+      dropPiece: function(row, col) {
+        if (!this.winner && !this.board[row][col]) {
+          this.board[row][col] = this.nextMove;
+          this.nextMove = this.nextMove == 'X' ? 'O' : 'X';
+          this.setUrl();
+        }
+      },
+      reset: function(){
+        this.board = [
+          ['', '', ''],
+          ['', '', ''],
+          ['', '', '']
+        ];
+        this.nextMove = 'X';
+        this.winner = '';
+        this.setUrl();
+      },
+      grade: function(){
+       var b = this.board;
+       this.winner =
+        row(0) || row(1) || row(2) ||
+        col(0) || col(1) || col(2) ||
+        diagonal(-1) || diagonal(1);
+       function row(r) { return same(b[r][0], b[r][1], b[r][2]);}
+       function col(c) { return same(b[0][c], b[1][c], b[2][c]);}
+       function diagonal(i) { return same(b[0][1-i], b[1][1], b[2][1+i]);}
+       function same(a, b, c) { return (a==b && b==c) ? a : '';};
+      },
+      setUrl: function(){
+        var rows = [];
+        angular.forEach(this.board, function(row){
+          rows.push(row.join(','));
+        });
+        this.$location.hashSearch.board = rows.join(';') + '/' + this.nextMove;
+      },
+      readUrl: function(value) {
+        if (value) {
+          value = value.split('/');
+          this.nextMove = value[1];
+          angular.forEach(value[0].split(';'), function(row, i){
+            this.board[i] = row.split(',');
+          }, this);
+          this.grade();
+        } else {
+          this.reset();
+        }
+      }
+    };
+    </script>
+    <h3>Tic-Tac-Toe</h3>
+    <div ng:controller="TicTacToeCntl">
+    Next Player: {{nextMove}}
+    <div class="winner" ng:show="winner">Player {{winner}} has won!</div>
+    <table class="board">
+      <tr ng:repeat="row in board" style="height:15px;">
+        <td ng:repeat="cell in row" ng:style="cellStyle"
+                ng:click="dropPiece($parent.$index, $index)">{{cell}}</td>
+      </tr>
+    </table>
+    <button ng:click="reset()">reset board</button>
+    </div>
+ </doc:source>
+ <doc:scenario>
+   it('should play a game', function(){
+    piece(1, 1);
+    expect(binding('nextMove')).toEqual('O');
+    piece(3, 1);
+    expect(binding('nextMove')).toEqual('X');
+    piece(1, 2);
+    piece(3, 2);
+    piece(1, 3);
+    expect(element('.winner').text()).toEqual('Player X has won!');
+   });
+
+   function piece(row, col) {
+     element('.board tr:nth-child('+row+') td:nth-child('+col+')').click();
+   }
+ </doc:scenario>
+</doc:example>
+
+
+# Things to notice
+
+* The controller is defined in JavaScript and has no reference to the rendering logic.
+* The controller is instantiated by <angular/> and injected into the view.
+* The controller can be instantiated in isolation (without a view) and the code will still execute.
+  This makes it very testable.
+* The HTML view is a projection of the model. In the above example, the model is stored in the
+  board variable.
+* All of the controller's properties (such as board and nextMove) are available to the view.
+* Changing the model changes the view.
+* The view can call any controller function.
+* In this example, the `setUrl()` and `readUrl()` functions copy the game state to/from the URL's
+  hash so the browser's back button will undo game steps. See deep-linking. This example calls
+  {@link angular.Scope.$watch $watch()} to set up a listener that invokes `readUrl()` when needed.

docs/cookbook.ngdoc

@@ -0,0 +1,60 @@
+@workInProgress
+@ngdoc overview
+@name Cookbook
+@description
+
+Welcome to the angular cookbook. Here we will show you typical uses of angular by example.
+
+
+# Hello World
+
+{@link cookbook.helloworld Hello World}: The simplest possible application that demonstrates the
+classic Hello World!
+
+
+# Basic Form
+
+{@link cookbook.form Basic Form}: Displaying forms to the user for editing is the bread and butter
+of web applications. Angular makes forms easy through bidirectional data binding.
+
+
+# Advanced Form
+
+{@link cookbook.formadvanced Advanced Form}: Taking the form example to the next level and
+providing advanced features such as  dirty detection, form reverting and submit disabling if
+validation errors exist.
+
+
+# Model View Controller
+
+{@link cookbook.mvc MVC}: Tic-Tac-Toe: Model View Controller (MVC) is a time-tested design pattern
+to separate the behavior (JavaScript controller) from the presentation (HTML view). This
+separation aids in maintainability and testability of your project.
+
+
+# Multi-page App and Deep Linking
+
+{@link cookbook.deeplinking Deep Linking}: An AJAX application never navigates away from the
+first page it loads. Instead, it changes the DOM of its single page. Eliminating full-page reloads
+is what makes AJAX apps responsive, but it creates a problem in that apps with a single URL
+prevent you from emailing links to a particular screen within your application.
+
+Deep linking tries to solve this by changing the URL anchor without reloading a page, thus
+allowing you to send links to specific screens in your app.
+
+
+# Services
+
+{@link angular.service Services}: Services are long lived objects in your applications that are
+available across controllers. A collection of useful services are pre-bundled with angular but you
+will likely add your own. Services are initialized using dependency injection, which resolves the
+order of initialization. This safeguards you from the perils of global state (a common way to
+implement long lived objects).
+
+
+# External Resources
+
+{@link cookbook.buzz Resources}: Web applications must be able to communicate with the external
+services to get and update data. Resources are the abstractions of external URLs which are
+specially tailored to angular data binding.
+

docs/directive.template

@@ -1,58 +0,0 @@
-<h1>{{name}}</h1>
-
-{{#workInProgress}}
-<fieldset class="workInProgress">
-  <legend>Work In Progress</legend>
-  This page is currently being revised. It might be incomplete or contain inaccuracies.
-  {{{workInProgress.description}}}
-</fieldset>
-{{/workInProgress}}
-
-{{#deprecated}}
-<fieldset class="deprecated">
-  <legend>Deprecated API</legend>
-  {{deprecated}}
-</fieldset>
-{{/deprecated}}
-
-<h2>Description</h2>
-{{{description}}}
-
-<h2>Usage</h2>
-<h3>In HTML Template Binding</h3>
-<tt>
-  <pre>
-&lt;{{element}} {{shortName}}="{{paramFirst.name}}"&gt;
-  ...
-&lt;/{{element}}&gt;
-  </pre>
-</tt>
-
-<h3>Parameters</h3>
-<ul>
-  {{#param}}
-  <li><tt>{{name}}</tt> –
-      <tt>&#123;{{#type}}{{type}}{{/type}}{{^type}}*{{/type}}{{#optional}}={{/optional}}&#125;</tt>
-      <tt>{{#default}}[{{default}}]{{/default}}</tt>
-      – {{{description}}}</li>
-  {{/param}}
-</ul>
-{{{paramDescription}}}
-
-{{#css}}
-<h3>CSS</h3>
-{{{css}}}
-{{/css}}
-
-{{#example}}
-<h2>Example</h2>
-{{{exampleDescription}}}
-<doc:example>
-  <doc:source>
-{{/example}}
-    {{{example}}}
-{{#example}}
-  </doc:source>
-  <doc:scenario>{{{scenario}}}</doc:scenario>
-</doc:example>
-{{/example}}

docs/doc_widgets.js

@@ -1,71 +0,0 @@
-(function(){
-  
-  var angularJsUrl;
-  var scripts = document.getElementsByTagName("script");
-  var filename = /(.*\/)angular([^\/]*)/;
-  for(var j = 0; j < scripts.length; j++) {
-    var src = scripts[j].src;
-    if (src && src.match(filename)) {
-      angularJsUrl = src;
-    }
-  }
-
-  
-  var HTML_TEMPLATE =
-  '<!doctype html>\n' +
-  '<html xmlns:ng="http://angularjs.org">\n' +
-  ' <script type="text/javascript" ng:autobind\n' + 
-  '         src="' + angularJsUrl + '"></script>\n' +
-  ' <body>\n' +
-  '_HTML_SOURCE_\n' +
-  ' </body>\n' +
-  '</html>';
-
-  angular.widget('doc:example', function(element){
-    this.descend(true); //compile the example code
-    element.hide();
-
-    var example = element.find('doc\\:source').eq(0),
-        exampleSrc = example.text(),
-        scenario = element.find('doc\\:scenario').eq(0);
-
-    var code = indent(exampleSrc);
-    var tabs = angular.element(
-        '<ul class="doc-example">' +
-          '<li class="doc-example-heading"><h3>Source</h3></li>' +
-          '<li class="doc-example-source" ng:non-bindable>' + 
-            '<pre class="brush: js; html-script: true; highlight: [' + 
-            code.hilite + ']; toolbar: false;"></pre></li>' +
-          '<li class="doc-example-heading"><h3>Live Preview</h3></li>' +
-          '<li class="doc-example-live">' + exampleSrc +'</li>' +
-          '<li class="doc-example-heading"><h3>Scenario Test</h3></li>' +
-          '<li class="doc-example-scenario"><pre class="brush: js">' + scenario.text() + '</pre></li>' +
-        '</ul>');
-    
-    tabs.find('li.doc-example-source > pre').text(HTML_TEMPLATE.replace('_HTML_SOURCE_', code.html));
-
-    element.html('');
-    element.append(tabs);
-    element.show();
-
-    var script = (exampleSrc.match(/<script[^\>]*>([\s\S]*)<\/script>/) || [])[1] || '';
-    try {
-      eval(script);
-    } catch (e) {
-      alert(e);
-    }
-  });
-  
-  function indent(text) {
-    var lines = text.split(/\n/);
-    var lineNo = [];
-    while (lines[0].match(/^\s*$/)) lines.shift();
-    while (lines[lines.length - 1].match(/^\s*$/)) lines.pop();
-    for ( var i = 0; i < lines.length; i++) {
-      lines[i] = '  ' + lines[i];
-      lineNo.push(6 + i);
-    }
-    return {html: lines.join('\n'), hilite: lineNo.join(',') };
-  };
-  
-})();

docs/docs-data.js

@@ -1 +0,0 @@
-NG_PAGES={{{JSON}}};

docs/docs-scenario.js

@@ -1,9 +0,0 @@
-{{#pages}}
-describe('{{name}}', function(){
-  beforeEach(function(){
-    browser().navigateTo('index.html#!{{name}}');
-  });
-  // {{raw.file}}:{{raw.line}}
-{{{scenario}}}
-});
-{{/pages}}

docs/fag.ngdoc

@@ -0,0 +1,81 @@
+@workInProgress
+@ngdoc overview
+@name FAQ
+@description
+
+#FAQ
+
+### Why is this project called "angular"? Why is the namespace called "ng"?
+
+Because HTML has angular brackets and "ng" sounds like "angular".
+
+### Is <angular/> an HTML5 tag?
+
+No, <angular/> is not an HTML5 tag. angular is an orthogonal project to HTML5; you can use the two
+together.
+
+### Is angular a {library, framework, DOM manipulation library, widget library, native plugin}?
+
+No, angular is none of these. You don't call its functions, it does not call your functions,
+it does not provide a way to manipulate DOM, but does provide primitives to create UI projections
+of your data. There are lots of existing widget libraries which you can integrate with angular.
+It is 100% JavaScript, 100% client side and compatible with both desktop and mobile browsers.
+
+### Do I need to worry about security holes in angular?
+
+Like with any technology, angular is not impervious to attack. angular does, however, provide
+built-in protection from basic security holes including cross-site scripting and HTML injection
+attacks. angular does round-trip escaping on all strings for you.
+
+### Can I download the source, build, and host the angular environment locally?
+
+Yes. See instructions in {@link guide.downloading downloading}.
+
+### Is angular a templating system?
+
+At the highest level, angular does look like a just another templating system. But there is one
+important reason why angular templating system is different and makes it very good fit for
+application development: bidirectional data binding. The template is compiled on the browser and
+the compilation step produces a live view. This means you, the developer, don't need to write
+code to constantly sync the view with the model and the model with the view as in other
+templating systems.
+
+### What browsers does angular work with?
+
+Webkit-based browsers (Safari, Chrome, iPhone, Android, WebOS, BlackBerry 6), Firefox, IE6 and
+above. Note that CSS only works on IE7 and above.
+
+### What's angular's performance like?
+
+angular takes ~300ms to load, render, and compile. In Chrome it uses about 2-5MB of memory. Your
+app's performance will vary depending on how many bindings you use.
+
+### How big is the angular bootstrap JS file that I need to include?
+
+The size of the library itself is < 50KB compressed and obfuscated.
+
+### Can I use the open-source Closure Library with angular?
+
+Yes, you can use widgets from the {@link http://code.google.com/closure/library Closure Library}
+in angular.
+
+### Does angular use the jQuery library?
+
+Yes, angular uses {@link http://jquery.com/ jQuery}, the open source DOM manipulation library.
+If jQuery is not present in your script path, angular falls back on its own implementation of
+{@link angular.element jQuery lite}. If jQuery is present in the path, angular uses it to
+manipulate the DOM.
+
+### What is testability like in angular?
+
+Very testable. It has an integrated dependency injection framework. See
+{@link angular.service service} for details.
+
+### How can I learn more about angular?
+
+Watch the July 28, 2010 talk
+"{@link http://www.youtube.com/watch?v=elvcgVSynRg| Angular: A Radically Different Way of Building AJAX Apps}".
+
+### How is angular licensed?
+
+The MIT License.

docs/filter.template

@@ -1,65 +0,0 @@
-<h1>{{name}}</h1>
-
-{{#workInProgress}}
-<fieldset class="workInProgress">
-  <legend>Work In Progress</legend>
-  This page is currently being revised. It might be incomplete or contain inaccuracies.
-  {{{workInProgress.description}}}
-</fieldset>
-{{/workInProgress}}
-
-{{#deprecated}}
-<fieldset class="deprecated">
-  <legend>Deprecated API</legend>
-  {{deprecated}}
-</fieldset>
-{{/deprecated}}
-
-<h2>Description</h2>
-{{{description}}}
-
-<h2>Usage</h2>
-<h3>In HTML Template Binding</h3>
-<tt>
-  <span>{{</span>
-  {{paramFirst.name}}_expression
-  | {{shortName}}{{#paramRest}}{{^default}}:{{name}}{{/default}}{{#default}}<i>[:{{name}}={{default}}]</i>{{/default}}{{/paramRest}}
-  <span> }}</span>
-</tt>
-<h3>In JavaScript</h3>
-<tt ng:non-bindable>
-angular.filter.{{shortName}}({{paramFirst.name}}{{#paramRest}}, {{name}}{{/paramRest}} );
-</tt>
-
-<h3>Parameters</h3>
-<ul>
-  {{#param}}
-  <li><tt>{{name}}</tt> –
-      <tt>&#123;{{#type}}{{type}}{{/type}}{{^type}}*{{/type}}{{#optional}}={{/optional}}&#125;</tt>
-      <tt>{{#default}}[{{default}}]{{/default}}</tt>
-      – {{{description}}}</li>
-  {{/param}}
-</ul>
-
-{{#returns}}
-<h3>Returns</h3>
-<tt>&#123;{{{type}}}&#125;</tt> {{{description}}}
-{{/returns}}
-
-{{#css}}
-<h3>CSS</h3>
-{{{css}}}
-{{/css}}
-
-{{#example}}
-<h2>Example</h2>
-{{{exampleDescription}}}
-<doc:example>
-  <doc:source>
-{{/example}}
-    {{{example}}}
-{{#example}}
-  </doc:source>
-  <doc:scenario>{{{scenario}}}</doc:scenario>
-</doc:example>
-{{/example}}

docs/formatter.template

@@ -1,53 +0,0 @@
-<h1>{{name}}</h1>
-
-{{#workInProgress}}
-<fieldset class="workInProgress">
-  <legend>Work In Progress</legend>
-  This page is currently being revised. It might be incomplete or contain inaccuracies.
-  {{{workInProgress.description}}}
-</fieldset>
-{{/workInProgress}}
-
-{{#deprecated}}
-<fieldset class="deprecated">
-  <legend>Deprecated API</legend>
-  {{deprecated}}
-</fieldset>
-{{/deprecated}}
-
-<h2>Description</h2>
-{{{description}}}
-
-<h2>Usage</h2>
-<h3>In HTML Template Binding</h3>
-<tt>
-  &lt;input type="text" ng:format="{{shortName}}"&gt;
-</tt>
-<h3>In JavaScript</h3>
-<tt ng:non-bindable>
-var userInputString = angular.formatter.{{shortName}}.format(modelValue);<br/>
-var modelValue = angular.formatter.{{shortName}}.parse(userInputString);
-</tt>
-
-{{#returns}}
-<h3>Returns</h3>
-<tt>&#123;{{{type}}}&#125;</tt> {{{description}}}
-{{/returns}}
-
-{{#css}}
-<h3>CSS</h3>
-{{{css}}}
-{{/css}}
-
-{{#example}}
-<h2>Example</h2>
-{{{exampleDescription}}}
-<doc:example>
-  <doc:source>
-{{/example}}
-    {{{example}}}
-{{#example}}
-  </doc:source>
-  <doc:scenario>{{{scenario}}}</doc:scenario>
-</doc:example>
-{{/example}}

docs/function.template

@@ -1,52 +0,0 @@
-<h1>{{name}}</h1>
-
-{{#workInProgress}}
-<fieldset class="workInProgress">
-  <legend>Work In Progress</legend>
-  This page is currently being revised. It might be incomplete or contain inaccuracies.
-  {{{workInProgress.description}}}
-</fieldset>
-{{/workInProgress}}
-
-{{#deprecated}}
-<fieldset class="deprecated">
-  <legend>Deprecated API</legend>
-  {{deprecated}}
-</fieldset>
-{{/deprecated}}
-
-<h2>Description</h2>
-{{{description}}}
-
-<h2>Usage</h2>
-<tt ng:non-bindable>
-{{name}}({{paramFirst.name}}{{#paramRest}}, {{name}}{{/paramRest}} );
-</tt>
-
-<h3>Parameters</h3>
-<ul>
-  {{#param}}
-  <li><tt>{{name}}</tt> –
-      <tt>&#123;{{#type}}{{type}}{{/type}}{{^type}}*{{/type}}{{#optional}}={{/optional}}&#125;</tt>
-      <tt>{{#default}}[{{default}}]{{/default}}</tt>
-      – {{{description}}}</li>
-  {{/param}}
-</ul>
-
-{{#returns}}
-<h3>Returns</h3>
-<tt>&#123;{{{type}}}&#125;</tt> {{{description}}}
-{{/returns}}
-
-{{#example}}
-<h2>Example</h2>
-{{{exampleDescription}}}
-<doc:example>
-  <doc:source>
-{{/example}}
-    {{{example}}}
-{{#example}}
-  </doc:source>
-  <doc:scenario>{{{scenario}}}</doc:scenario>
-</doc:example>
-{{/example}}

docs/guide.bootstrap.ngdoc

@@ -0,0 +1,97 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Bootstrap
+@description
+
+# Bootstrap
+This section explains how to bootstrap your application to the angular environment using either
+the `angular.js` or `angular.min.js` script.
+
+## The bootstrap code
+
+Note that there are two versions of the bootstrap code that you can use:
+
+* `angular-0.0.0.js` - this file is unobfuscated, uncompressed, and thus human-readable.
+* `angular-0.0.0.min.js` - this is a compressed and obfuscated version of angular-debug.js.
+
+In this section and throughout the Developer Guide, feel free to use `angular.min.js` instead of
+`angular.js` when working through code examples.
+
+## ng:autobind
+
+The simplest way to get an angular application up and running is by inserting a script tag in your
+HTML file that bootstraps the `angular.js` code and uses the special `ng:autobind` attribute,
+like in this snippet of HTML:
+
+<doc:example>
+ <doc:source>
+  Hello {{'World'}}!
+ </doc:source>
+</doc:example>
+
+The `ng:autobind` attribute tells angular to compile and manage the whole HTML document. The
+compilation occurs in the page's onLoad handler. Note that you don't need to explicitly add an
+onLoad event; auto bind mode takes care of all the magic for you.
+
+## Manual bind
+
+Using autobind mode is a handy way to start using angular, but advanced users who want more
+control over the initialization process might prefer to use manual bind mode instead.
+
+The best way to get started with manual bind mode is to look at the magic behind `ng:autobind`
+by writing out each step of the autobind process explicitly. Note that the following code is
+equivalent to the code in the previous section.
+
+<pre>
+<!DOCTYPE HTML>
+<html xmlns:ng="http://angularjs.org">
+ <script type="text/javascript" src="http://code.angularjs.org/angular-0.0.0.min.js"></script>
+ <script type="text/javascript">
+  (function(window, previousOnLoad){
+   window.onload = function(){
+   try { (previousOnLoad||angular.noop)(); } catch(e) {}
+   angular.compile(window.document).$init();
+   };
+  })(window, window.onload);
+ </script>
+ <body>
+  Hello {{'World'}}!
+ </body>
+</html>
+</pre>
+
+This is the sequence that your code should follow if you're writing your own manual binding code:
+
+ * After the page is loaded, find the root of the HTML template, which is typically the root of
+   the document.
+ * Run the HTML compiler, which converts the templates into an executable, bi-directionally
+   bound application.
+
+
+# XML Namespace
+
+**IMPORTANT:** When using angular you must declare the `ng` namespace using the `xmlns` tag.
+  If you don't declare the namespace, Internet Explorer does not render widgets properly.
+
+<pre>
+<html  xmlns:ng="http://angularjs.org">
+</pre>
+
+
+# Create your own namespace
+
+If you want to define your own widgets, you must create your own namespace and use that namespace
+to form the fully qualified widget name. For example, you could map the alias my to your domain
+and create a widget called my:widget. To create your own namespace, simply add another xmlsn tag
+to your page, create an alias, and set it to your unique domain:
+
+<pre>
+<html  xmlns:my="http://mydomain.com">
+</pre>
+
+
+# Global Object
+
+The angular script creates a single global variable `angular` in the global namespace. All APIs are
+bound to fields of this global object.
+

docs/guide.compiler.ngdoc

@@ -0,0 +1,163 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Compiler
+@description
+
+#Compiler
+
+While angular might look like just a cool way to build web applications, the core of angular is
+actually an HTML compiler. The default HTML transformations that this compiler provides are useful
+for building generic apps, but you can also use them to create a domain-specific language for
+building specific types of web applications.
+
+The compiler allows you to add behavior to existing HTML through widgets, directives, and text
+markup.
+
+All of this compilation happens in the web browser, meaning no server is involved.
+
+# The compilation process
+This section describes the steps that angular's HTML compiler goes through. If you use
+`ng:autobind` in your application, this compilation process happens automatically when the
+application is initialized (e.g. when the user loads the app in a browser). If you're an advanced
+user using manual bind mode, you can decide when and how often the compilation happens.
+
+First, a bit of background of what the compilation step is for. Every type of
+{@link angular.widget widget}, {@link angular.markup markup}, and
+{@link angular.directive directive} in angular is defined with a compile function, and that
+compile function returns an optional link function. Here is the relationship between the two:
+
+ * **compile function** - registers a listener for the widget, markup, or directive's expression.
+   This function is called exactly once.
+ * **link function** - sets up the listener. This function can be called multiple times, once per
+   cloned DOM element (e.g. repeating element).
+
+Note that angular's built-in widgets, markup, and directives have predefined compile and link
+functions that you don't need to modify. However, if you're writing your own widgets, markup, or
+directives, you write compile and link functions. Refer to the Compiler API for more information.
+
+When the HTML compiler compiles a page, it goes through 3 phases: Compile, Create Root Scope, and
+Link.
+
+## 1. Compile Phase
+
+ * Recursively traverse the DOM, depth-first.
+ * Look for a matching compile function of type widget, then markup, then directive.
+ * If a compile function is found then execute it.
+ * When the compile function completes, it should return a link function. Aggregate this link
+   function with all link functions returned previously by step 1c.
+ * Repeat steps 1c and 1d for all compile functions found. The result of the compilation step is
+   the aggregate link function, which comprises all of the individual link functions.
+
+## 2. Create Root Scope
+
+ * Inject all of the services into the root scope.
+
+## 3. Link Phase
+
+ * Execute the aggregate link function with the root scope. The aggregate link function calls all
+   the individual link functions that were generated in the compile phase.
+ * If there are any clones of the DOM caused by repeating elements, call the link function multiple
+   times, one for each repeating item.
+
+Note that while the compile function is executed exactly once, the link function can be executed
+multiple times: once for each iteration in a repeater.
+
+# Example
+
+The compilation process is best understood through example. Let's say that in your namespace my,
+you want to create a new DOM element <my:greeter/>, which should display a greeting.
+
+If we want this HTML source:
+
+<pre>
+<div ng:init="salutation='Hello'; name='World'">
+  <my:greeter salutation="salutation" name="name"/>
+</div>
+</pre>
+
+To produce this DOM:
+
+<pre>
+<div ng:init="salutation='Hello'; name='World'">
+  <my:greeter salutation="salutation" name="name"/>
+    <span class="salutation">Hello</span>
+    <span class="name">World</span>!
+  </my:greeter>
+</div>
+</pre>
+
+Write this widget definition (assuming you've already declared the my namespace in the page):
+
+
+<pre>
+angular.widget('my:greeter', function(compileElement){
+  var compiler = this;
+  compileElement.css('display', 'block');
+  var salutationExp = compileElement.attr('salutation');
+  var nameExp = compileElement.attr('name');
+  return function(linkElement){
+    var salutationSpan = angular.element('<span class="salutation"></span');
+    var nameSpan = angular.element('<span class="name"></span>');
+    linkElement.append(salutationSpan);
+    linkElement.append(compiler.text(' '));
+    linkElement.append(nameSpan);
+    linkElement.append(compiler.text('!'));
+    this.$watch(salutationExp, function(value){
+      salutationSpan.text(value);
+    });
+    this.$watch(nameExp, function(value){
+    nameSpan.text(value);
+    });
+  };
+});
+</pre>
+
+Note: For more about widgets, see {@link angular.widget Widget}.
+
+## Compilation process for this example
+
+Here are the steps that the compiler goes through for the page that contains this widget definition:
+
+### Compile Phase
+
+ * Recursively traverse the DOM depth-first.
+ * Find the angular.widget definition.
+ *  Find and execute the widget's compileElement function, which includes the following steps:
+   * Add a style element with attribute display: block; to the template DOM so that the browser
+     knows to treat the element as block element for rendering. (Note: because this style element
+     was added on the template compileElement, this style is automatically applied to any clones
+     of the template (i.e. any repeating elements)).
+   * Extract the salutation and name HTML attributes as angular expressions.
+ * Return the aggregate link function, which includes just one link function in this example.
+
+### Link Phase
+
+ * Execute the aggregate link function, which includes the following steps:
+   * Create a <span> element set to the salutation class
+   * Create a <span> element set to the name class.
+ * Add the span elements to the linkElement. (Note: be careful not to add them to the
+   compileElement, because that's the template.)
+ * Set up watches on the expressions. When an expression changes, copy the data to the
+   corresponding spans.
+
+
+## Compiler API
+
+If you define your own widgets, markup, or directives, you need to access the compiler API.
+This section describes the methods on the compiler that you can call.
+
+Note: As of 12 August 2010, these methods are subject to change.
+
+Recall that the compile function's this is a reference to the compiler.
+
+ * `compile(element)` - returns `linker` - Invoke new instance of compiler to compile a DOM element
+   and return a linker function. You can apply the linker function to the original element or a
+   clone of the original element. The linker function returns a scope.
+ * `comment(commentText)` - returns `element` - Create a comment element.
+ * `element(elementName)` - returns `element` - Create an element by name.
+ * `text(text)` - returns `element` - Create a text element.
+ * `descend([set])` - returns `descend` - State  Get or set the current descend state. If true the
+    compiler will descend to children elements.
+ * `directives([set])` - returns `directive` - State Get or set the current directives processing
+   state. The compiler will process directives only when directives set to true.
+

docs/guide.contribute.ngdoc

@@ -0,0 +1,27 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Contributing
+@description
+
+# Open Source
+Angular is an open source project licensed under the
+{@link http://github.com/angular/angular.js/blob/master/LICENSE MIT license}. We welcome any
+contributions from the community, but in order to make the contribution process manageable, we ask
+you to follow the following guidelines:
+
+# Source Code
+* Discuss any major changes on our {@link http://groups.google.com/group/angular mailing list}.
+  For small changes and bugfixes, just go ahead and craft your patch and submit it.
+* Use coding style described
+  {@link http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml here}.
+* To submit any changes, we ask you to use {@link http://github.com}
+  * Create a github {@link https://github.com/signup/free account}
+  * Clone the {@link http://github.com/angular/angular.js main angular repository}
+  * Create a new branch off of the master (`git branch my-fix-branch`)
+  * Switch to the branch (`git checkout my-fix-branch`), make your changes and commit (`git commit -a`)
+  * For any new features or regressions we require a test(s) to be submitted with the change
+  * Run js lint (`rake lint`) and fix any warnings or errors
+  * Push your branch to github (`git push origin my-fix-branch`)
+  * Send a pull request via github into `angular:master`
+  * Once the patch is reviewed and merged, you can delete your branch (`git push origin :my-fix-branch; git checkout master; git branch -D my-fix-branch`)
+  * TADA!

docs/guide.css.ngdoc

@@ -0,0 +1,46 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: CSS
+@description
+
+# CSS
+angular includes built-in CSS classes, which in turn have predefined CSS styles.
+
+# Built-in CSS classes
+
+## `ng-exception`
+
+**Usage:** angular applies this class to a DOM element if that element contains an Expression that
+threw an exception when evaluated.
+
+**Styling:** The built-in styling of the ng-exception class displays an error message surrounded
+by a solid red border, for example:
+
+ > <div class="ng-exception">Error message</div>
+
+
+
+You can try to evaluate malformed expressions in {@link angualr.expression expression} to see the
+`ng-exception` class' styling.
+
+## `ng-validation-error`
+
+**Usage:** angular applies this class to an input widget element if that element's input does not
+pass validation. Note that you set the validation criteria on the input widget element using the
+Ng:validate or Ng:required directives.
+
+**Styling:** The built-in styling of the ng-validation-error class turns the border of the input
+box red and includes a hovering UI element that includes more details of the validation error. You
+can see an example in {@link angular.widget.@ng:validate ng:validate example}.
+
+## How to override the styles for built-in classes
+
+To override the styles for these built-in classes, you can do any of the following:
+
+Download the source code, edit angular.css, and host the source on your own server.
+Create a local css file, overriding any styles that you'd like, and link to it from your HTML file
+as you normally would:
+
+<pre>
+<link href="yourfile.css" rel="stylesheet" type="text/css">
+</pre>

docs/guide.data-binding.ngdoc

@@ -0,0 +1,41 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Data Binding
+@description
+
+# Data Binding
+
+Data-binding allows you to treat the model as the single-source-of-truth of your application, and
+consider the view as only a projection of the model, at all times. The process of copying the model
+values to the view, and any changes to the view by the user to the model, is known as data-binding.
+
+## Classical Template Systems
+
+<img class="right" src="img/One_Way_Data_Binding.png"/>
+At the highest level, angular looks like a just another templating system. But there is one
+important reason why angular templating system is different and makes it very good fit for
+application development: two-way data binding.
+
+Most templating systems bind data in only one direction: they merge a template and model together
+into a view, as illustrated in the diagram to the right. After the merge occurs, any changes to
+the model or in related sections of the view are NOT automatically reflected in the view. Worse,
+any changes that the user makes to the view are not reflected in the model. This means that the
+developer has to write code that constantly syncs the view with the model and the model with the
+view.
+
+
+# angular Template Systems
+<img class="right" src="img/Two_Way_Data_Binding.png"/>
+The way angular templates works is different, as illustrated in the diagram on the right. They are
+different because first the template (which is the uncompiled HTML along with any additional markup
+or directives) is compiled on the browser, and second, the compilation step produces a live view.
+We say live because any changes to the view are immediately reflected in the model, and any changes
+in the model are propagated to the view. This makes the model always the single-source-of-truth for
+the application state, greatly simplifying the programing model for the developer. You can think of
+the view as simply an instant projection of your model.
+
+Because the view is just a projection of the model, the controller is completely separated from the
+view and unaware of it. This makes testing a snap because it is easy to test your controller in
+isolation without the view and the related DOM/browser dependency.
+
+For details about how data binding works in angular, see {@link angular.scope Scope}.

docs/guide.downloading.ngdoc

@@ -0,0 +1,35 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Downloading
+@description
+
+# Downloading
+Follow these steps to download, compile, and host angular.js on your own server:
+
+## Step 0
+
+If you don't already have Rake (Ruby Make) installed, download and install it from
+http://rake.rubyforge.org/.
+
+## Step 1
+
+Download the angular source code from GitHub: http://github.com/angular/angular.js.
+
+## Step 2
+
+The source code should include a Rakefile. Compile the source by typing rake compile.
+
+## Step 3
+
+Host the files on your server. Look through your source tree and make sure that the css and js
+directories are parallel (i.e. share a common root node).
+
+In the js directory you should see these different versions of the angular bootstrap code:
+
+* **angular-?.?.?.js** - this file is unobfuscated, uncompressed, and human-readable. Note that
+  despite the name of the file, there is no additional functionality built in to help you debug
+  your application; it has the prefix debug because you can read the source code.
+* **angular-?.?.?.min.js** - this is a compressed and obfuscated version of `angular-?.?.?.js`.
+  You might want to use this version if you want to load a smaller but functionally equivalent
+  version of the code in your application. Note: this minified version was created using the
+  Closure Compiler.

docs/guide.expression.ngdoc

@@ -0,0 +1,207 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Expression
+@description
+
+# Expressions
+Expressions are the bindings that you write in HTML and embed in templates in order to create
+views in angular. They are not equivalent to JavaScript expressions.
+
+For example, these are all valid expressions in angular:
+
+* `1+2={{1+2}}`
+* `3*10|currency`
+* `Hello {{name}}!`
+* `Hello {{'World'}}!`
+
+
+# angular expressions vs. JS expressions
+It might be tempting to think of angular view expressions as JavaScript expressions, but that is
+not entirely correct. angular does not use a simple JavaScript eval of the expression text. You
+can think of angular expressions as JavaScript expressions with these differences:
+
+ * **Attribute Evaluation:** evaluation of all attributes are against the current scope, not to
+   the global window as in JavaScript.
+ * **Forgiving:** expression evaluation is forgiving to undefined and null, unlike in JavaScript.
+ * **No Control Flow Statements:** you cannot do the following from an angular expression:
+   conditionals, loops, or throw.
+ * **Type Augmentation:** the scope expression evaluator augments built-in types.
+ * **Filters:** you can add filters to an expression, for example to convert raw data into a
+   human-readable format.
+ * **The $:** angular reserves this prefix to differentiate its API names from others.
+
+If you want to run arbitrary JavaScript code, make it a controller method and call that. If you
+want to eval an angular expression from JavaScript, use the Scope:$eval() method.
+
+## Example
+<doc:example>
+ <doc:source>
+  1+2={{1+2}}
+ </doc:source>
+ <doc:scenario>
+  it('should calculate expression in binding', function(){
+    expect(binding('1+2')).toEqual('3');
+  });
+ </doc:scenario>
+</doc:example>
+
+You can try evaluating different expressions here:
+
+<doc:example>
+ <doc:source>
+  <div ng:init="exprs=[]" class="expressions">
+    Expression:
+    <input type='text' name="expr" value="3*10|currency" size="80"/>
+    <button ng:click="exprs.$add(expr)">Evaluate</button>
+    <ul>
+     <li ng:repeat="expr in exprs">
+       [ <a href="" ng:click="exprs.$remove(expr)">X</a> ]
+       <tt>{{expr}}</tt> => <span ng:bind="$parent.$eval(expr)"></span>
+      </li>
+    </ul>
+  </div>
+ </doc:source>
+ <doc:scenario>
+  it('should allow user expression testing', function(){
+     element('.expressions :button').click();
+     var li = using('.expressions ul').repeater('li');
+     expect(li.count()).toBe(1);
+     expect(li.row(0)).toEqual(["3*10|currency", "$30.00"]);
+  });
+ </doc:scenario>
+</doc:example>
+
+# Attribute Evaluation
+
+Evaluation of all attributes are against the current scope. Unlike JavaScript, where names
+default to global window properties, angular expressions have to use $window to refer to the
+global object. E.g. if you want to call alert(), which is defined on window, an expression must
+use $window.alert(). This is done intentionally to prevent accidental access to the global state
+(a common source of subtle bugs).
+
+<doc:example>
+ <doc:source>
+  <div class="example2" ng:init="$window = $service('$window')">
+    Name: <input name="name" type="text" value="World"/>
+    <button ng:click="($window.mockWindow || $window).alert('Hello ' + name)">Greet</button>
+  </div>
+ </doc:source>
+ <doc:scenario>
+  it('should calculate expression in binding', function(){
+    var alertText;
+    this.addFutureAction('set mock', function($window, $document, done) {
+      $window.mockWindow = {
+        alert: function(text){ alertText = text; }
+      };
+      done();
+    });
+    element(':button:contains(Greet)').click();
+    expect(this.addFuture('alert text', function(done) {
+      done(null, alertText);
+    })).toBe('Hello World');
+  });
+ </doc:scenario>
+</doc:example>
+
+## Forgiving
+
+Expression evaluation is forgiving to undefined and null. In JavaScript, evaluating a.b.c throws
+an exception if a is not an object. While this makes sense for a general purpose language, the
+expression evaluations are primarily used for data binding, which often look like this: `{{a.b.c}}`.
+It makes more sense to show nothing than to throw an exception if a is undefined (e.g. perhaps
+we are waiting for the server response, and it will become defined soon). If expression
+evaluation wasn't forgiving we'd have to write bindings that clutter the code, for example:
+`{{((a||{}).b||{}).c}}`
+
+Similarly, invoking a function a.b.c() on undefined or null simply returns undefined.
+
+Assignments work the same way in reverse. a.b.c = 10 creates the intermediary objects even if a
+is undefined.
+
+
+## No Control Flow Statements
+
+You cannot write a control flow statement in an expression. The reason behind this is core to
+the angular philosophy that application logic should be in controllers, not in the view. If you
+need a conditional (including ternary operators), loop, or to throw from a view expression,
+delegate to a JavaScript method instead.
+
+
+## Type Augmentation
+
+Built-in types have methods like [].push(), but the richness of these methods is limited. Consider
+the example below, which allows you to do a simple search over a canned set of contacts. The
+example would be much more complicated if we did not have the Array:$filter(). There is no
+built-in method on Array called $filter and angular doesn't add it to Array.prototype because that
+could collide with other JavaScript frameworks.
+
+For this reason the scope expression evaluator augments the built-in types to make them act like
+they have extra methods. The actual method for $filter() is angular.Array.filter(). You can call
+it from JavaScript.
+
+Extensions: You can further extend the expression vocabulary by adding new methods to
+`angular.Array` or `angular.String`, etc.
+
+<doc:example>
+ <doc:source>
+  <div ng:init="friends = [
+    {name:'John', phone:'555-1212'},
+    {name:'Mary', phone:'555-9876'},
+    {name:'Mike', phone:'555-4321'},
+    {name:'Adam', phone:'555-5678'},
+    {name:'Julie', phone:'555-8765'}]"></div>
+  Search: <input name="searchText"/>
+  <table class="example3">
+    <tr><th>Name</th><th>Phone</th><tr>
+    <tr ng:repeat="friend in friends.$filter(searchText)">
+      <td>{{friend.name}}</td>
+      <td>{{friend.phone}}</td>
+    </tr>
+  </table>
+ </doc:source>
+ <doc:scenario>
+  it('should filter the list', function(){
+     var tr = using('table.example3').repeater('tr.ng-attr-widget');
+     expect(tr.count()).toBe(5);
+     input('searchText').enter('a');
+     expect(tr.count()).toBe(2);
+
+  });
+ </doc:scenario>
+</doc:example>
+
+## Filters
+
+When presenting data to the user, you might need to convert the data from its raw format to a
+user-friendly format. For example, you might have a data object that needs to be formatted
+according to the locale before displaying it to the user. You can pass expressions through a
+chain of filters like this:
+
+<pre>
+name | uppercase
+</pre>
+
+The expression evaluator simply passes the value of name to angular.filter.uppercase.
+
+Chain filters using this syntax:
+
+<pre>
+value | filter1 | filter2
+</pre>
+
+You can also pass colon-delimited arguments to filters, for example, to display the number 123
+with 2 decimal points: 123 | number:2
+
+# The $
+
+You might be wondering, what is the significance of the $ prefix? It is simply a prefix that
+angular chooses to differentiate its API names from others. If angular didn't use $, then
+evaluating a.length() would return undefined because neither a nor angular define such a property.
+Consider that in a future version of angular we might choose to add a length method, in which case
+the behavior of the expression would change. Worse yet, you the developer could create a length
+property and then we would have collision. This problem exists because angular augments existing
+objects with additional behavior. By prefixing its additions with $ we are reserving our namespace
+so that angular developers and developers who use angular can develop in harmony without
+collisions.
+
+

docs/guide.ngdoc

@@ -0,0 +1,37 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide
+@description
+
+* {@link guide.overview Overview} - An overview of angular, including its philosophy and how it
+  works.
+* {@link guide.bootstrap Bootstrap} - How to bootstrap your application to the angular environment.
+* {@link guide.template Template} - How to define your application's view using HTML, CSS, and
+  other built-in angular constructs.
+* {@link guide.compiler Compiler} - All about the HTML compiler that's at the core of angular.
+  * {@link angular.directive Directive} - How to use XML attributes to augment an existing DOM
+    element.
+  * {@link angular.markup Markup} - How to use markup to create shorthand for a widget or a
+    directive. For example, markup is what allows you to use the double curly brace notation
+    `{{}}` to bind expressions to elements.
+    * {@link guide.data-binding Data Binding} - About the mechanism that keeps the model the single
+      source of truth of your application at all times, with the view as a live projection of the
+      model.
+    * {@link angular.filter Filter} - How to format your data for display to the user.
+  * {@link angular.widget Widget} - How to create new DOM elements that the browser doesn't already
+    understand.
+    * {@link angular.validator Validator} - How to validate user input.
+    * {@link angular.formatter Formatter} - How to format stored data to user-readable text and
+      parse the text back to the stored form.
+  * {@link guide.css CSS} - Built-in CSS classes, when angular assigns them, and how to override
+    their styles.
+* {@link angular.scope Scope} - The model in the model-view-controller design pattern. You can
+  think about scopes as the JavaScript objects that have extra APIs for registering watchers.
+  * {@link guide.expression Expression} - The bindings that are embedded in an angular View.
+* {@link angular.service Service} - Objects that are wired through dependency injection and then
+  injected into the root scope.
+* {@link guide.testing Testing}
+  * service:$browser(mock)
+* {@link guide.downloading Downloading} - How to download, compile, and host the angular
+  environment on your own server.
+* {@link guide.contribute Contributing} - How to contribute to angular project.

docs/guide.overview.ngdoc

@@ -0,0 +1,166 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Overview
+@description
+
+# What is angular?
+Angular teaches your old browser new tricks. It is what HTML would have been if it had been
+designed for building web applications.
+
+Take a simple example of user input as shown below. If you were using just HTML and JavaScript to
+implement this form, you would need to define listeners, DOM updates, and complex input validators
+in order to update and format the result. In angular you can achieve the effect with zero lines
+of JavaScript code using a declarative approach. Click on the source tab of the example below to
+view the angular implementation of this form.
+
+<doc:example>
+ <doc:source>
+  QTY: <input name="qty" value="1" ng:validate="integer:0" ng:required/>
+  *
+  Cost: <input name="cost" value="19.95" ng:validate="number" ng:required/>
+  =
+  {{qty * cost | currency}}
+ </doc:source>
+ <doc:scenario>
+  it('should show of angular binding', function(){
+    expect(binding('qty * cost')).toEqual('$19.95');
+    input('qty').enter('2');
+    input('cost').enter('5.00');
+    expect(binding('qty * cost')).toEqual('$10.00');
+  });
+ </doc:scenario>
+</doc:example>
+
+Angular is to AJAX apps as Ruby on Rails is to round trip apps.
+
+# Angular frees you from:
+ * **Registering callbacks:** Registering callbacks clutters your code, and it makes it hard to see
+   the forest from the trees. Removing common boilerplate code such as callbacks is advantageous
+   because it leaves the JavaScript with a more succinct version of your code, better describing
+   what your application does.
+ * **Manipulating HTML DOM programatically:** Manipulating HTML DOM is a cornerstone of AJAX
+   applications, but it is very cumbersome and error-prone. By declaratively describing how the UI
+   should change as your application state changes, you are freed from low level DOM manipulation
+   activities. Most applications written with angular never have to programatically manipulate
+   the DOM.
+ * **Marshaling data to and from the UI:** CRUD operations make up the majority of most AJAX
+   applications. The flow of marshaling data from the server to an internal object to a HTML form,
+   validating the form, displaying validation errors, returning to an internal model and then back
+   to the server creates a lot of boilerplate code. angular eliminates almost all of this
+   boilerplate. leaving code that is richer and describes the overall flow of the application
+   rather than implementation details.
+ * **Writing tons of initialization code just to get started:** Typically you need to write a lot
+   of plumbing and initialization code just to get a basic "Hello World" AJAX app working. With
+   angular you can bootstrap your app easily using services, which are auto-injected into your
+   application in a GUICE-like dependency-injection style. This allows you to get started
+   developing features quickly. As a bonus, you get full control over the initialization process
+   in automated tests.
+
+
+# angular is/has:
+ * **An HTML Compiler:** angular is an HTML compiler in the browser. It allows you to give meaning
+   to any HTML element, attribute, or text and create new primitives as building blocks for your
+   application.
+ * **Declarative:** Declarative means that you describe what the page looks like rather than
+   instructing how to draw the page. HTML is great at declaring static documents. Angular extends
+   the declarative nature of HTML beyond static documents to define dynamic applications.
+ * **Declarative Templates:** In angular, you write HTML to declare the view and UI templates for
+   your application. You can express many common application constructs without using any
+   JavaScript at all.
+ * **Bidirectional Data Binding:** Allows your application to have a single source of truth
+   (your model), where the HTML is a projection of the internal state of your application, which
+   you can provide to the user in a declarative way.
+ * **Built-in Services:** angular provides many standard AJAX operations to get you going quickly,
+   and dependency-injection allows you to swap them out as needed. Common services include:
+   Dependency Inject, History Management, URL Router, AJAX/XHR requests, and data caching,
+   to name a few.
+ * **Very testable:** Testing difficulty is dramatically affected by the way you structure your
+   code. With angular, testability is baked in.
+
+# angular is NOT a:
+ * **Library:** You don't call its functions.
+ * **Framework:** It does not call your functions.
+ * **DOM Manipulation Library:** It does not provide a way to manipulate DOM, but does provide
+   primitives to create UI projections of your data.
+ * **Widget Library:** There are lots of existing widget libraries that you can integrate with
+   angular.
+
+
+
+# Not just another templating system
+
+At the highest level, angular looks like a just another templating system, but there are few
+important reasons why angular is different and makes it a very good fit for application
+development.
+
+Angular:
+ * **Uses HTML/CSS syntax:** This makes it easy to read and can be edited with existing HTML/CSS
+   authoring tools.
+ * **Extends HTML vocabulary:** Angular allows you to create new HTML tags, which expand into
+   dynamic UI components.
+ * **Executes in the browser:** Removes the round trip to the server for many operations and
+   creates instant feedback for users.
+ * **Bidirectional data binding:** The model is the single source of truth. Programmatic changes
+   to the model are automatically reflected in the view. Any changes by the user to the view are
+   automatically reflected in the model.
+ * **Services:** These allow for a reusable way of injecting dependencies into an application.
+ * **MVC:** Clean separation between model-view-controller, which aids in understanding,
+   maintenance, and testing of large systems.
+
+
+# The angular philosophy
+
+Angular is built around the belief that declarative code is preferred over imperative when it
+comes to building UIs and connecting the pieces together.
+
+As an example, if you wanted to add a new label to your application, you could do so by simply
+adding text to the HTML template, saving the code, and refreshing your browser:
+
+<pre>
+<span class="label">Hello</span>
+</pre>
+
+In programmatic systems you would have to write and run code like this:
+
+<pre>
+var label = new Label();
+label.setText('Hello');
+label.setClass('label');
+parent.addChild(label);
+</pre>
+
+## Benefits:
+
+ * Compile-free: Change your template and logic code and reload the browser to see it run
+   immediately. In contrast, programmatic serverside views often need to be compiled and executed
+   to be viewed, which takes time. This dramatically increases the speed of your development cycle.
+ * Declarative templates are easier to understand and change than programmatic instructions.
+ * Declarative templates can be edited in existing HTML editors such as DreamWeaver, Eclipse,
+   TextMate, Vim, etc.
+ * Declarative templates can be edited by web designers without the need to work with web
+   developers.
+
+HTML is missing certain features, which angular adds via its compiler, thereby "teaching" the
+browser these new tricks:
+
+ * Dynamic behavior
+ * Componentizing HTML snippets into reusable components
+ * Dynamically include other HTML templates
+ * Two-way data binding
+ * Rich validation in forms
+ * Model-View-Controller modularization
+
+# Watch a presentation about angular
+
+<object width="480" height="385">
+  <param name="movie" value="http://www.youtube.com/v/elvcgVSynRg&amp;hl=en_US&amp;fs=1"></param>
+  <param name="allowFullScreen" value="true"></param>
+  <param name="allowscriptaccess" value="always"></param>
+  <embed src="http://www.youtube.com/v/elvcgVSynRg&amp;hl=en_US&amp;fs=1"
+         type="application/x-shockwave-flash" allowscriptaccess="always"
+         allowfullscreen="true" width="480" height="385"></embed>
+</object>
+
+{@link https://docs.google.com/present/edit?id=0Abz6S2TvsDWSZDQ0OWdjaF8yNTRnODczazdmZg&hl=en&authkey=CO-b7oID Presentation}
+|
+{@link https://docs.google.com/document/edit?id=1ZHVhqC0apbzPRQcgnb1Ye-bAUbNJ-IlFMyPBPCZ2cYU&hl=en&authkey=CInnwLYO Source}

docs/guide.template.ngdoc

@@ -0,0 +1,22 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Template
+@description
+#Template
+
+You can think of a template in angular as a domain-specific language that you can use to easily
+build the view of your web application. You create a template by writing HTML and CSS, and you can
+add any constructs that you want to the HTML. This means that you can attach rendering and behavior
+to any HTML element, attribute or markup text.
+
+In addition to writing HTML and CSS, you can also use the following angular constructs to create
+your template:
+
+ * **Directive** - XML attributes that augment an existing DOM element.
+ * **Markup** - Lets you create shorthand for a widget or a directive. For example, markup is what
+                allows you to use the double curly brace notation {{}} to bind expressions to
+                elements.
+ * **Filter** - Lets you format your data for display to the user.
+ * **Widget** - Lets you create new DOM elements that the browser doesn't already understand.
+ * **Validator** - Lets you validate user input.
+ * **Formatter** - Lets you format the input object into a user readable view.

docs/guide.testing.ngdoc

@@ -0,0 +1,8 @@
+@workInProgress
+@ngdoc overview
+@name Developer Guide: Testing
+@description
+
+# Testing Angular Applications
+
+to be written...

docs/overview.template

@@ -1,31 +0,0 @@
-<h1>{{name}}</h1>
-
-{{#workInProgress}}
-<fieldset class="workInProgress">
-  <legend>Work In Progress</legend>
-  This page is currently being revised. It might be incomplete or contain inaccuracies.
-  {{{workInProgress.description}}}
-</fieldset>
-{{/workInProgress}}
-
-{{#deprecated}}
-<fieldset class="deprecated">
-  <legend>Deprecated API</legend>
-  {{deprecated}}
-</fieldset>
-{{/deprecated}}
-
-{{{description}}}
-
-{{#example}}
-<h2>Example</h2>
-{{{exampleDescription}}}
-<doc:example>
-  <doc:source>
-{{/example}}
-    {{{example}}}
-{{#example}}
-  </doc:source>
-  <doc:scenario>{{{scenario}}}</doc:scenario>
-</doc:example>
-{{/example}}

docs/service.template

@@ -25,19 +25,23 @@
   {{/requires}}
 </ul>
 
+{{#method.length}}
 <h2>Methods</h2>
 <ul>
   {{#method}}
-  <li><tt>{{shortName}}</tt>: {{{description}}}</li>
+  <li><tt>{{shortName}}()</tt>: {{{description}}}</li>
   {{/method}}
 </ul>
+{{/method.length}}
 
+{{#property.length}}
 <h2>Properties</h2>
 <ul>
   {{#property}}
   <li><tt>{{name}}:{{#type}}{{type}}{{/type}}</tt>{{#description}}: {{{description}}}{{/description}}</li>
   {{/property}}
 </ul>
+{{/property.length}}
 
 {{#example}}
 <h2>Example</h2>
@@ -50,4 +54,4 @@
   </doc:source>
   {{#scenario}}<doc:scenario>{{{scenario}}}</doc:scenario>{{/scenario}}
 </doc:example>
-{{/example}}
+{{/example}}

docs/spec/collectSpec.js

@@ -1,288 +0,0 @@
-console.log(__dirname);
-require.paths.push(__dirname + "/../");
-require.paths.push(__dirname + "/../../");
-var fs = require('fs');
-var Script = process.binding('evals').Script;
-var collect = load('docs/collect.js');
-
-describe('collect', function(){
-  describe('markdown', function(){
-    it('should replace angular in markdown', function(){
-      expect(collect.markdown('<angular/>')).
-        toEqual('<p><tt>&lt;angular/&gt;</tt></p>');
-    });
-    
-    it('should not replace anything in <pre>', function(){
-      expect(collect.markdown('bah x\n<pre>\nangular.k\n</pre>\n asdf x')).
-        toEqual(
-            '<p>bah x</p>' +
-            '<pre>\nangular.k\n</pre>' + 
-            '<p>asdf x</p>');
-    });
-    
-    it('should replace text between two <pre></pre> tags', function() {
-      expect(collect.markdown('<pre>x</pre># One<pre>b</pre>')).
-        toEqual('<pre>x</pre><h1>One</h1><pre>b</pre>');
-    });
-  });
-  
-  describe('processNgDoc', function() {
-    var processNgDoc = collect.processNgDoc,
-        documentation;
-
-    beforeEach(function() {
-      documentation = {
-        pages: [],
-        byName: {}
-      };
-    });
-    
-    it('should store references to docs by name', function() {
-      var doc = {ngdoc: 'section', name: 'fake', raw: {text:''}};
-      processNgDoc(documentation, doc);
-      expect(documentation.byName.fake).toBe(doc);
-    });
-    
-    it('should connect doc to owner (specified by @methodOf)', function() {
-      var parentDoc = {ngdoc: 'section', name: 'parent', raw: {text:''}};
-      var doc = {ngdoc: 'section', name: 'child', methodOf: 'parent', raw: {text:''}};
-      processNgDoc(documentation, parentDoc);
-      processNgDoc(documentation, doc);
-      expect(documentation.byName.parent.method).toBeDefined();
-      expect(documentation.byName.parent.method[0]).toBe(doc);
-    });
-    
-    it('should not add doc to sections if @memberOf specified', function() {
-      var parentDoc = {ngdoc: 'parent', name: 'parent', raw: {text:''}};
-      var doc = {ngdoc: 'child', name: 'child', methodOf: 'parent', raw: {text:''}};
-      processNgDoc(documentation, parentDoc);
-      processNgDoc(documentation, doc);
-      expect(documentation.pages.child).not.toBeDefined();
-    });
-    
-    it('should throw exception if owner does not exist', function() {
-      expect(function() {
-        processNgDoc(documentation, {ngdoc: 'section', methodOf: 'not.exist', raw: {text:''}});
-      }).toThrow('Owner "not.exist" is not defined.');
-    });
-    
-    it('should ignore non-ng docs', function() {
-      var doc = {name: 'anything'};
-      expect(function() {
-        processNgDoc(documentation, doc);
-      }).not.toThrow();
-      expect(documentation.pages).not.toContain(doc);
-    });
-  });
-  
-  describe('TAG', function(){
-    var TAG = collect.TAG;
-    var doc;
-    beforeEach(function(){
-      doc = {};
-    });
-    
-    describe('@param', function(){
-      it('should parse with no default', function(){
-        TAG.param(doc, 'param', 
-            '{(number|string)} number Number \n to format.');
-        expect(doc.param).toEqual([{ 
-          type : '(number|string)', 
-          name : 'number',
-          optional: false,
-          'default' : undefined, 
-          description : 'Number \n to format.' }]);
-      });
-      it('should parse with default and optional', function(){
-        TAG.param(doc, 'param', 
-            '{(number|string)=} [fractionSize=2] desc');
-        expect(doc.param).toEqual([{ 
-          type : '(number|string)', 
-          name : 'fractionSize',
-          optional: true,
-          'default' : '2', 
-          description : 'desc' }]);
-      });
-    });
-    
-    describe('@requires', function() {
-      it('should parse more @requires tag into array', function() {
-        TAG.requires(doc, 'requires', '$service');
-        TAG.requires(doc, 'requires', '$another');
-        
-        expect(doc.requires).toEqual([
-          {name: '$service'},
-          {name: '$another'}
-        ]);
-      });
-    });
-
-    describe('@property', function() {
-      it('should parse @property tags into array', function() {
-        TAG.property(doc, 'property', '{type} name1 desc');
-        TAG.property(doc, 'property', '{type} name2 desc');
-        expect(doc.property.length).toEqual(2);
-      });
-      
-      it('should parse @property with only name', function() {
-        TAG.property(doc, 'property', 'fake');
-        expect(doc.property[0].name).toEqual('fake');
-      });
-      
-      it('should parse @property with optional type', function() {
-        TAG.property(doc, 'property', '{string} name');
-        expect(doc.property[0].name).toEqual('name');
-        expect(doc.property[0].type).toEqual('string');
-      });
-      
-      it('should parse @property with optional description', function() {
-        TAG.property(doc, 'property', 'name desc rip tion');
-        expect(doc.property[0].name).toEqual('name');
-        expect(doc.property[0].description).toEqual('desc rip tion');
-      });
-      
-      it('should parse @property with type and description both', function() {
-        TAG.property(doc, 'property', '{bool} name desc rip tion');
-        expect(doc.property[0].name).toEqual('name');
-        expect(doc.property[0].type).toEqual('bool');
-        expect(doc.property[0].description).toEqual('desc rip tion');
-      });
-      
-      /**
-       * If property description is undefined, this variable is not set in the template,
-       * so the whole @description tag is used instead
-       */
-      it('should set undefined description to "false"', function() {
-        TAG.property(doc, 'property', 'name');
-        expect(doc.property[0].description).toBe(false);
-      });
-    });
-    
-    describe('@methodOf', function() {
-      it('should parse @methodOf tag', function() {
-        expect(function() {
-          TAG.methodOf(doc, 'methodOf', 'parentName');
-        }).not.toThrow();
-        expect(doc.methodOf).toEqual('parentName');
-      });
-    });
-    
-    describe('@returns', function() {
-      it('should not parse @returns without type', function() {
-      expect(function() {TAG.returns(doc, 'returns', 'lala');})
-        .toThrow();
-      });
-      
-      it('should parse @returns with type and description', function() {
-        TAG.returns(doc, 'returns', '{string} descrip tion');
-        expect(doc.returns).toEqual({type: 'string', description: 'descrip tion'});
-      });
-
-      it('should transform description of @returns with markdown', function() {
-        TAG.returns(doc, 'returns', '{string} descrip *tion*');
-        expect(doc.returns).toEqual({type: 'string', description: 'descrip <em>tion</em>'});
-      });
-
-      it('should support multiline content', function() {
-        TAG.returns(doc, 'returns', '{string} description\n new line\n another line');
-        expect(doc.returns).
-          toEqual({type: 'string', description: 'description\n new line\n another line'});
-      });
-    });
-    
-    describe('@description', function(){
-      it('should support pre blocks', function(){
-        TAG.description(doc, 'description', '<pre>abc</pre>');
-        expect(doc.description).
-          toBe('<div ng:non-bindable><pre class="brush: js; html-script: true;">abc</pre></div>');
-      });
-
-      it('should support multiple pre blocks', function() {
-        TAG.description(doc, 'description', 'foo \n<pre>abc</pre>\n#bah\nfoo \n<pre>cba</pre>');
-        expect(doc.description).
-          toBe('<p>foo </p>' +
-               '<div ng:non-bindable><pre class="brush: js; html-script: true;">abc</pre></div>' +
-               '<h2>bah</h2>\n\n' +
-               '<p>foo </p>' +
-               '<div ng:non-bindable><pre class="brush: js; html-script: true;">cba</pre></div>');
-
-      });
-
-      it('should support nested @link annotations with or without description', function() {
-        TAG.description(doc, 'description',
-            'foo {@link angular.foo}\n\n da {@link angular.foo bar foo bar } \n\n' +
-            'dad{@link angular.foo}\n\n' +
-            '{@link angular.directive.ng:foo ng:foo}');
-        expect(doc.description).
-          toBe('<p>foo <a href="#!angular.foo"><code>angular.foo</code></a></p>\n\n' +
-               '<p>da <a href="#!angular.foo"><code>bar foo bar</code></a> </p>\n\n' +
-               '<p>dad<a href="#!angular.foo"><code>angular.foo</code></a></p>\n\n' +
-               '<p><a href="#!angular.directive.ng:foo"><code>ng:foo</code></a></p>');
-      });
-
-      it('should increment all headings by one', function() {
-        TAG.description(doc, 'description', '# foo\nabc');
-        expect(doc.description).
-          toBe('<h2>foo</h2>\n\n<p>abc</p>');
-      });
-    });
-
-    describe('@example', function(){
-      it('should not remove {{}}', function(){
-        TAG.example(doc, 'example', 'text {{ abc }}');
-        expect(doc.example).toEqual('text {{ abc }}');
-      });
-    });
-
-    describe('@deprecated', function() {
-      it('should parse @deprecated', function() {
-        TAG.deprecated(doc, 'deprecated', 'Replaced with foo.');
-        expect(doc.deprecated).toBe('Replaced with foo.');
-      })
-    });
-
-    describe('@workInProgress', function() {
-      it('should parse @workInProgress without a description and default to true', function() {
-        TAG.workInProgress(doc, 'workInProgress', '');
-        expect(doc.workInProgress).toEqual({description: ''});
-      });
-
-      it('should parse @workInProgress with a description', function() {
-        TAG.workInProgress(doc, 'workInProgress', 'my description');
-        expect(doc.workInProgress).toEqual({description: '<p>my description</p>'});
-      });
-    });
-
-  });
-  
-  describe('trim', function(){
-    var trim = collect.trim;
-    it('should remove leading/trailing space', function(){
-      expect(trim('  \nabc\n  ')).toEqual('abc');
-    });
-    
-    it('should remove leading space on every line', function(){
-      expect(trim('\n 1\n  2\n   3\n')).toEqual('1\n 2\n  3');
-    });
-  });
-  
-  describe('keywords', function(){
-    var keywords = collect.keywords;
-    it('should collect keywords', function(){
-      expect(keywords('\nHello: World! @ignore.')).toEqual('hello world');
-      expect(keywords('The `ng:class-odd` and ')).toEqual('and ng:class-odd the');
-    });
-  });
-
-});
-
-function load(path){
-  var sandbox = {
-      require: require,
-      console: console,
-      __dirname: __dirname,
-      testmode: true
-  };
-  Script.runInNewContext(fs.readFileSync(path), sandbox, path);
-  return sandbox;
-}

docs/spec/domSpec.js

@@ -0,0 +1,33 @@
+var DOM = require('dom.js').DOM;
+
+describe('dom', function(){
+  var dom;
+
+  beforeEach(function(){
+    dom = new DOM();
+  });
+
+  describe('h', function(){
+
+    it('should render using function', function(){
+      var cbThis;
+      var cdValue;
+      dom.h('heading', 'content', function(value){
+        cbThis = this;
+        cbValue = value;
+      });
+      expect(cbThis).toEqual(dom);
+      expect(cbValue).toEqual('content');
+    });
+
+    it('should update heading numbers', function(){
+      dom.h('heading', function(){
+        this.html('<h1>sub-heading</h1>');
+      });
+      expect(dom.toString()).toContain('<h1>heading</h1>');
+      expect(dom.toString()).toContain('<h2>sub-heading</h2>');
+    });
+
+  });
+
+});

docs/spec/ngdocSpec.js

@@ -0,0 +1,449 @@
+var ngdoc = require('ngdoc.js');
+var DOM = require('dom.js').DOM;
+
+describe('ngdoc', function(){
+  var Doc = ngdoc.Doc;
+  var dom;
+
+  beforeEach(function(){
+    dom = new DOM();
+    this.addMatchers({
+      toContain: function(text) {
+        this.actual = this.actual.toString();
+        return this.actual.indexOf(text) > -1;
+      }
+    });
+  });
+
+  describe('Doc', function(){
+    describe('metadata', function(){
+
+      it('should find keywords', function(){
+        expect(new Doc('\nHello: World! @ignore. $abc').keywords()).toEqual('$abc hello world');
+        expect(new Doc('The `ng:class-odd` and').keywords()).toEqual('and ng:class-odd the');
+      });
+
+      it('should have shortName', function(){
+        var d1 = new Doc('@name a.b.c').parse();
+        var d2 = new Doc('@name a.b.ng:c').parse();
+        var d3 = new Doc('@name some text: more text').parse();
+        expect(ngdoc.metadata([d1])[0].shortName).toEqual('c');
+        expect(ngdoc.metadata([d2])[0].shortName).toEqual('ng:c');
+        expect(ngdoc.metadata([d3])[0].shortName).toEqual('more text');
+      });
+
+      it('should have depth information', function(){
+        var d1 = new Doc('@name a.b.c').parse();
+        var d2 = new Doc('@name a.b.ng:c').parse();
+        var d3 = new Doc('@name some text: more text').parse();
+        expect(ngdoc.metadata([d1])[0].depth).toEqual(2);
+        expect(ngdoc.metadata([d2])[0].depth).toEqual(2);
+        expect(ngdoc.metadata([d3])[0].depth).toEqual(1);
+      });
+
+    });
+
+    describe('parse', function(){
+      it('should convert @names into properties', function(){
+        var doc = new Doc('\n@name name\n@desc\ndesc\ndesc2\n@dep\n');
+        doc.parse();
+        expect(doc.name).toEqual('name');
+        expect(doc.desc).toEqual('desc\ndesc2');
+        expect(doc.dep).toEqual('');
+      });
+
+      it('should parse parameters', function(){
+        var doc = new Doc(
+            '@param {*} a short\n' +
+            '@param {Type} b med\n' +
+            '@param {Class=} [c=2] long\nline');
+        doc.parse();
+        expect(doc.param).toEqual([
+           {name:'a', description:'<p>short</p>', type:'*', optional:false, 'default':undefined},
+           {name:'b', description:'<p>med</p>', type:'Type', optional:false, 'default':undefined},
+           {name:'c', description:'<p>long\nline</p>', type:'Class', optional:true, 'default':'2'}
+         ]);
+      });
+
+      it('should parse return', function(){
+        var doc = new Doc('@returns {Type} text *bold*.');
+        doc.parse();
+        expect(doc.returns).toEqual({
+          type: 'Type',
+          description: '<p>text <em>bold</em>.</p>'
+        });
+      });
+
+      it('should parse filename', function(){
+        var doc = new Doc('@name friendly name', 'docs/a.b.ngdoc', 1);
+        doc.parse(0);
+        expect(doc.id).toEqual('a.b');
+        expect(doc.name).toEqual('friendly name');
+      });
+
+      it('should escape <doc:source> element', function(){
+        var doc = new Doc('@description before <doc:example>' +
+            '<doc:source>\n<>\n</doc:source></doc:example> after');
+        doc.parse();
+        expect(doc.description).toContain('<p>before </p><doc:example>' +
+            '<doc:source>\n&lt;&gt;\n</doc:source></doc:example><p>after</p>');
+      });
+
+      it('should escape <doc:scenario> element', function(){
+        var doc = new Doc('@description before <doc:example>' +
+            '<doc:scenario>\n<>\n</doc:scenario></doc:example> after');
+        doc.parse();
+        expect(doc.description).toContain('<p>before </p><doc:example>' +
+            '<doc:scenario>\n&lt;&gt;\n</doc:scenario></doc:example><p>after</p>');
+      });
+
+      describe('sorting', function(){
+        function property(name) {
+          return function(obj) {return obj[name];};
+        }
+        function noop(){}
+        function doc(type, name){
+          return {
+              id: name,
+              ngdoc: type,
+              keywords: noop
+          };
+        }
+
+        var angular_widget = doc('overview', 'angular.widget');
+        var angular_x = doc('function', 'angular.x');
+        var angular_y = doc('property', 'angular.y');
+
+        it('should put angular.fn() in front of angular.widget, etc', function(){
+          expect(ngdoc.metadata([angular_widget, angular_y, angular_x]).map(property('id')))
+            .toEqual(['angular.x', 'angular.y', 'angular.widget' ]);
+        });
+      });
+    });
+  });
+
+  describe('markdown', function(){
+    it('should replace angular in markdown', function(){
+      expect(new Doc().markdown('<angular/>')).
+        toEqual('<p><tt>&lt;angular/&gt;</tt></p>');
+    });
+
+    it('should not replace anything in <pre>, but escape the html escape the content', function(){
+      expect(new Doc().markdown('bah x\n<pre>\n<b>angular</b>.k\n</pre>\n asdf x')).
+        toEqual(
+            '<p>bah x</p>' +
+            '<div ng:non-bindable><pre class="brush: js; html-script: true;">\n' +
+            '&lt;b&gt;angular&lt;/b&gt;.k\n' +
+            '</pre></div>' +
+            '<p>asdf x</p>');
+    });
+
+    it('should replace text between two <pre></pre> tags', function() {
+      expect(new Doc().markdown('<pre>x</pre># One<pre>b</pre>')).
+        toMatch('</div><h1>One</h1><div');
+    });
+
+    it('should unindent text before processing based on the second line', function() {
+      expect(new Doc().markdown('first line\n' +
+                                '   second line\n\n' +
+                                '       third line\n' +
+                                '        fourth line\n\n' +
+                                '   fifth line')).
+        toMatch('<p>first line\n' +
+                'second line</p>\n\n' +
+                '<pre><code>third line\n' +
+                ' fourth line\n</code></pre>\n\n' +
+                '<p>fifth line</p>');
+    });
+
+    it('should unindent text before processing based on the first line', function() {
+      expect(new Doc().markdown('   first line\n\n' +
+                                '       second line\n' +
+                                '       third line\n' +
+                                '        fourth line\n\n' +
+                                '   fifth line')).
+        toMatch('<p>first line</p>\n\n' +
+                '<pre><code>second line\n' +
+                'third line\n' +
+                ' fourth line\n</code></pre>\n\n' +
+                '<p>fifth line</p>');
+    });
+
+
+  });
+
+  describe('trim', function(){
+    var trim = ngdoc.trim;
+    it('should remove leading/trailing space', function(){
+      expect(trim('  \nabc\n  ')).toEqual('abc');
+    });
+
+    it('should remove leading space on every line', function(){
+      expect(trim('\n 1\n  2\n   3\n')).toEqual('1\n 2\n  3');
+    });
+  });
+
+  describe('merge', function(){
+    it('should merge child with parent', function(){
+      var parent = new Doc({name:'angular.service.abc'});
+      var methodA = new Doc({name:'methodA', methodOf:'angular.service.abc'});
+      var methodB = new Doc({name:'methodB', methodOf:'angular.service.abc'});
+      var propA = new Doc({name:'propA', propertyOf:'angular.service.abc'});
+      var propB = new Doc({name:'propB', propertyOf:'angular.service.abc'});
+      var docs = [methodB, methodA, propB, propA, parent]; // keep wrong order;
+      ngdoc.merge(docs);
+      expect(docs.length).toEqual(1);
+      expect(docs[0].name).toEqual('angular.service.abc');
+      expect(docs[0].methods).toEqual([methodA, methodB]);
+      expect(docs[0].properties).toEqual([propA, propB]);
+    });
+
+  });
+
+  ////////////////////////////////////////
+
+  describe('TAG', function(){
+    describe('@param', function(){
+      it('should parse with no default', function(){
+        var doc = new Doc('@param {(number|string)} number Number \n to format.');
+        doc.parse();
+        expect(doc.param).toEqual([{
+          type : '(number|string)',
+          name : 'number',
+          optional: false,
+          'default' : undefined,
+          description : '<p>Number \nto format.</p>' }]);
+      });
+
+      it('should parse with default and optional', function(){
+        var doc = new Doc('@param {(number|string)=} [fractionSize=2] desc');
+        doc.parse();
+        expect(doc.param).toEqual([{
+          type : '(number|string)',
+          name : 'fractionSize',
+          optional: true,
+          'default' : '2',
+          description : '<p>desc</p>' }]);
+      });
+    });
+
+    describe('@requires', function() {
+      it('should parse more @requires tag into array', function() {
+        var doc = new Doc('@requires $service\n@requires $another');
+        doc.parse();
+        expect(doc.requires).toEqual(['$service', '$another']);
+      });
+    });
+
+    describe('@property', function() {
+      it('should parse @property tags into array', function() {
+        var doc = new Doc("@property {type} name1 desc\n@property {type} name2 desc");
+        doc.parse();
+        expect(doc.properties.length).toEqual(2);
+      });
+
+      it('should not parse @property without a type', function() {
+        var doc = new Doc("@property fake");
+        expect(function() { doc.parse(); }).
+          toThrow(new Error("Not a valid 'property' format: fake"));
+      });
+
+      it('should parse @property with type', function() {
+        var doc = new Doc("@property {string} name");
+        doc.parse();
+        expect(doc.properties[0].name).toEqual('name');
+        expect(doc.properties[0].type).toEqual('string');
+      });
+
+      it('should parse @property with optional description', function() {
+        var doc = new Doc("@property {string} name desc rip tion");
+        doc.parse();
+        expect(doc.properties[0].name).toEqual('name');
+        expect(doc.properties[0].description).toEqual('<p>desc rip tion</p>');
+      });
+
+      it('should parse @property with type and description both', function() {
+        var doc = new Doc("@property {bool} name desc rip tion");
+        doc.parse();
+        expect(doc.properties[0].name).toEqual('name');
+        expect(doc.properties[0].type).toEqual('bool');
+        expect(doc.properties[0].description).toEqual('<p>desc rip tion</p>');
+      });
+
+    });
+
+    describe('@returns', function() {
+      it('should not parse @returns without type', function() {
+        var doc = new Doc("@returns lala");
+        expect(doc.parse).toThrow();
+      });
+
+      it('should parse @returns with type and description', function() {
+        var doc = new Doc("@returns {string} descrip tion");
+        doc.parse();
+        expect(doc.returns).toEqual({type: 'string', description: '<p>descrip tion</p>'});
+      });
+
+      it('should transform description of @returns with markdown', function() {
+        var doc = new Doc("@returns {string} descrip *tion*");
+        doc.parse();
+        expect(doc.returns).toEqual({type: 'string', description: '<p>descrip <em>tion</em></p>'});
+      });
+
+      it('should support multiline content', function() {
+        var doc = new Doc("@returns {string} description\n new line\n another line");
+        doc.parse();
+        expect(doc.returns).
+          toEqual({type: 'string', description: '<p>description\nnew line\nanother line</p>'});
+      });
+    });
+
+    describe('@description', function(){
+      it('should support pre blocks', function(){
+        var doc = new Doc("@description <pre>abc</pre>");
+        doc.parse();
+        expect(doc.description).
+          toBe('<div ng:non-bindable><pre class="brush: js; html-script: true;">abc</pre></div>');
+      });
+
+      it('should support multiple pre blocks', function() {
+        var doc = new Doc("@description foo \n<pre>abc</pre>\n#bah\nfoo \n<pre>cba</pre>");
+        doc.parse();
+        expect(doc.description).
+          toBe('<p>foo </p>' +
+               '<div ng:non-bindable><pre class="brush: js; html-script: true;">abc</pre></div>' +
+               '<h1>bah</h1>\n\n' +
+               '<p>foo </p>' +
+               '<div ng:non-bindable><pre class="brush: js; html-script: true;">cba</pre></div>');
+
+      });
+
+      it('should support nested @link annotations with or without description', function() {
+        var doc = new Doc("@description " +
+            'foo {@link angular.foo}\n\n da {@link angular.foo bar foo bar } \n\n' +
+            'dad{@link angular.foo}\n\n' +
+            'external{@link http://angularjs.org}\n\n' +
+            'external{@link ./static.html}\n\n' +
+            '{@link angular.directive.ng:foo ng:foo}');
+        doc.parse();
+        expect(doc.description).
+          toContain('foo <a href="#!angular.foo"><code>angular.foo</code></a>');
+        expect(doc.description).
+          toContain('da <a href="#!angular.foo"><code>bar foo bar</code></a>');
+        expect(doc.description).
+          toContain('dad<a href="#!angular.foo"><code>angular.foo</code></a>');
+        expect(doc.description).
+          toContain('<a href="#!angular.directive.ng:foo"><code>ng:foo</code></a>');
+        expect(doc.description).
+          toContain('<a href="http://angularjs.org">http://angularjs.org</a>');
+        expect(doc.description).
+          toContain('<a href="./static.html">./static.html</a>');
+      });
+
+    });
+
+    describe('@example', function(){
+      it('should not remove {{}}', function(){
+        var doc = new Doc('@example text {{ abc }}');
+        doc.parse();
+        expect(doc.example).toEqual('<p>text {{ abc }}</p>');
+      });
+
+      it('should support doc:example', function(){
+        var doc = new Doc('@ngdoc overview\n@example \n' +
+            '<doc:example>\n' +
+            ' <doc:source><escapeme></doc:source>\n' +
+            ' <doc:scenario><scenario></doc:scenario>\n' +
+            '</doc:example>').parse();
+        var html = doc.html();
+        expect(html).toContain('<doc:source>&lt;escapeme&gt;</doc:source>');
+        expect(html).toContain('<doc:scenario>&lt;scenario&gt;</doc:scenario>');
+        expect(doc.scenarios).toEqual(['<scenario>']);
+      });
+    });
+
+    describe('@depricated', function() {
+      it('should parse @depricated', function() {
+        var doc = new Doc('@deprecated Replaced with foo.');
+        doc.parse();
+        expect(doc.deprecated).toBe('Replaced with foo.');
+      });
+    });
+
+    describe('@this', function(){
+      it('should render @this', function() {
+        var doc = new Doc('@this I am self.');
+        doc.ngdoc = 'filter';
+        doc.parse();
+        expect(doc.html()).toContain('<h3>Method\'s <code>this</code></h3>\n' +
+            '<div>' +
+            '<p>I am self.</p>' +
+            '</div>\n');
+        expect(doc.html()).toContain('<h3>Method\'s <code>this</code></h3>\n' +
+            '<div><p>I am self.</p></div>');
+      });
+    });
+  });
+
+  describe('usage', function(){
+    describe('overview', function(){
+      it('should supress description heading', function(){
+        var doc = new Doc('@ngdoc overview\n@name angular\n@description\n#heading\ntext');
+        doc.parse();
+        expect(doc.html()).toContain('text');
+        expect(doc.html()).toContain('<h2>heading</h2>');
+        expect(doc.html()).not.toContain('Description');
+      });
+    });
+
+
+    describe('filter', function(){
+      it('should format', function(){
+        var doc = new Doc({
+          ngdoc:'formatter',
+          shortName:'myFilter',
+          param: [
+            {name:'a'},
+            {name:'b'}
+          ]
+        });
+        doc.html_usage_filter(dom);
+        expect(dom).toContain('myFilter_expression | myFilter:b');
+        expect(dom).toContain('angular.filter.myFilter(a, b)');
+      });
+    });
+
+    describe('validator', function(){
+      it('should format', function(){
+        var doc = new Doc({
+          ngdoc:'validator',
+          shortName:'myValidator',
+          param: [
+            {name:'a'},
+            {name:'b'}
+          ]
+        });
+        doc.html_usage_validator(dom);
+        expect(dom).toContain('ng:validate="myValidator:b"');
+        expect(dom).toContain('angular.validator.myValidator(a, b)');
+      });
+    });
+
+    describe('formatter', function(){
+      it('should format', function(){
+        var doc = new Doc({
+          ngdoc:'formatter',
+          shortName:'myFormatter',
+          param: [
+            {name:'a'},
+          ]
+        });
+        doc.html_usage_formatter(dom);
+        expect(dom).toContain('ng:format="myFormatter:a"');
+        expect(dom).toContain('var userInputString = angular.formatter.myFormatter.format(modelValue, a);');
+        expect(dom).toContain('var modelValue = angular.formatter.myFormatter.parse(userInputString, a);');
+      });
+    });
+  });
+
+});

docs/spec/sitemapSpec.js

@@ -0,0 +1,23 @@
+var SiteMap = require('sitemap.js').SiteMap;
+var Doc = require('ngdoc.js').Doc;
+
+
+describe('sitemap', function(){
+  it('should render empty sitemap', function(){
+    var map = new SiteMap([]);
+    expect(map.render()).toEqual([
+      '<?xml version="1.0" encoding="UTF-8"?>',
+      '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">',
+      '</urlset>', ''].join('\n'));
+  });
+
+  it('should render ngdoc url', function(){
+    var map = new SiteMap([new Doc({name: 'a.b.c<>\'"&'})]);
+    expect(map.render()).toContain([
+      ' <url>',
+      '<loc>http://docs.angularjs.org/#!a.b.c&lt;&gt;&apos;&quot;&amp;</loc>',
+      '<changefreq>weekly</changefreq>',
+      '</url>'].join(''));
+
+  });
+});

docs/spec/specs.js

@@ -0,0 +1,39 @@
+if (global.jasmine) return;
+
+require.paths.push(__dirname + "/../../lib");
+require.paths.push(__dirname + '/../src');
+var jasmine = require('jasmine-1.0.1');
+var sys = require('util');
+
+for(var key in jasmine) {
+  global[key] = jasmine[key];
+}
+
+//Patch Jasmine for proper stack traces
+jasmine.Spec.prototype.fail = function (e) {
+  var expectationResult = new jasmine.ExpectationResult({
+    passed: false,
+    message: e ? jasmine.util.formatException(e) : 'Exception'
+  });
+  // PATCH
+  if (e) {
+   expectationResult.trace = e;
+  }
+  this.results_.addResult(expectationResult);
+};
+
+
+
+var isVerbose = false;
+var showColors = true;
+process.argv.forEach(function(arg){
+  switch(arg) {
+  case '--color': showColors = true; break;
+  case '--noColor': showColors = false; break;
+  case '--verbose': isVerbose = true; break;
+  }
+});
+
+jasmine.executeSpecsInFolder(__dirname, function(runner, log){
+  process.exit(runner.results().failedCount);
+}, isVerbose, showColors);

docs/spec/writerSpec.js

@@ -0,0 +1,18 @@
+var writer = require('writer.js');
+describe('writer', function(){
+  describe('toString', function(){
+    var toString = writer.toString;
+
+    it('should merge string', function(){
+      expect(toString('abc')).toEqual('abc');
+    });
+
+    it('should merge obj', function(){
+      expect(toString({a:1})).toEqual('{"a":1}');
+    });
+
+    it('should merge array', function(){
+      expect(toString(['abc',{}])).toEqual('abc{}');
+    });
+  });
+});

docs/specs.js

@@ -1,21 +0,0 @@
-require.paths.push("./lib");
-var jasmine = require('jasmine-1.0.1');
-var sys = require('util');
-
-for(var key in jasmine) {
-  global[key] = jasmine[key];
-}
-
-var isVerbose = false;
-var showColors = true;
-process.argv.forEach(function(arg){
-  switch(arg) {
-  case '--color': showColors = true; break;
-  case '--noColor': showColors = false; break;
-  case '--verbose': isVerbose = true; break;
-  }
-});
-
-jasmine.executeSpecsInFolder(__dirname + '/spec', function(runner, log){
-  process.exit(runner.results().failedCount);
-}, isVerbose, showColors);

docs/src/SiteMap.js

@@ -0,0 +1,31 @@
+exports.SiteMap = SiteMap;
+
+/**
+ * @see http://www.sitemaps.org/protocol.php
+ *
+ * @param docs
+ * @returns {SiteMap}
+ */
+function SiteMap(docs){
+  this.render = function(){
+    var map = [];
+    map.push('<?xml version="1.0" encoding="UTF-8"?>');
+    map.push('<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">');
+    docs.forEach(function(doc){
+      map.push(' <url><loc>http://docs.angularjs.org/#!' +
+          encode(doc.name) + '</loc><changefreq>weekly</changefreq></url>');
+    });
+    map.push('</urlset>');
+    map.push('');
+    return map.join('\n');
+  };
+
+  function encode(text){
+    return text
+      .replace(/&/mg, '&amp;')
+      .replace(/</mg, '&lt;')
+      .replace(/>/mg, '&gt;')
+      .replace(/'/mg, '&apos;')
+      .replace(/"/mg, '&quot;');
+  }
+}

docs/src/callback.js

@@ -2,7 +2,10 @@ function noop(){}
 
 function chain(delegateFn, explicitDone){
   var onDoneFn = noop;
-  var onErrorFn = noop;
+  var onErrorFn = function(e){
+    console.error(e.stack || e);
+    process.exit(-1);
+  };
   var waitForCount = 1;
   delegateFn = delegateFn || noop;
   var stackError = new Error('capture stack');

docs/src/dom.js

@@ -0,0 +1,126 @@
+/**
+ * DOM generation class
+ */
+
+exports.DOM = DOM;
+exports.htmlEscape = htmlEscape;
+
+//////////////////////////////////////////////////////////
+
+function htmlEscape(text){
+  return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
+
+function DOM(){
+  this.out = [];
+  this.headingDepth = 0;
+}
+
+var INLINE_TAGS = {
+    i: true,
+    b: true
+};
+
+DOM.prototype = {
+  toString: function() {
+    return this.out.join('');
+  },
+
+  text: function(content) {
+    if (typeof content == "string") {
+      this.out.push(htmlEscape(content));
+    } else if (typeof content == 'function') {
+      content.call(this, this);
+    } else if (content instanceof Array) {
+      this.ul(content);
+    }
+  },
+
+  html: function(html) {
+    if (html) {
+      var headingDepth = this.headingDepth;
+      for ( var i = 10; i > 0; --i) {
+        html = html
+          .replace(new RegExp('(<\/?h)' + i + '(>)', 'gm'), function(all, start, end){
+            return start + (i + headingDepth) + end;
+          });
+      }
+      this.out.push(html);
+    }
+  },
+
+  tag: function(name, attr, text) {
+    if (!text) {
+      text = attr;
+      attr = {};
+      if (name == 'code')
+        attr['ng:non-bindable'] = '';
+    }
+    this.out.push('<' + name);
+    for(var key in attr) {
+      this.out.push(" " + key + '="' + attr[key] + '"');
+    }
+    this.out.push('>');
+    this.text(text);
+    this.out.push('</' + name + '>');
+    if (!INLINE_TAGS[name])
+      this.out.push('\n');
+  },
+
+  code: function(text) {
+    this.tag('div', {'ng:non-bindable':''}, function(){
+      this.tag('pre', {'class':"brush: js; html-script: true;"}, text);
+    });
+  },
+
+  h: function(heading, content, fn){
+    if (content==undefined || (content instanceof Array && content.length == 0)) return;
+    this.headingDepth++;
+    this.tag('h' + this.headingDepth, heading);
+    var className = typeof heading == 'string'
+      ? {'class': heading.toLowerCase().replace(/[^\d\w_]/mg, '-').replace(/-+/gm, '-')}
+      : null;
+    if (content instanceof Array) {
+      this.ul(content, className, fn);
+    } else if (fn) {
+      this.tag('div', className, function(){
+        fn.call(this, content);
+      });
+    } else {
+      this.tag('div', className, content);
+    }
+    this.headingDepth--;
+  },
+
+  h1: function(attr, text) {
+    this.tag('h1', attr, text);
+  },
+
+  h2: function(attr, text) {
+    this.tag('h2', attr, text);
+  },
+
+  h3: function(attr, text) {
+    this.tag('h3', attr, text);
+  },
+
+  p: function(attr, text) {
+    this.tag('p', attr, text);
+  },
+
+  ul: function(list, attr, fn) {
+    if (typeof attr == 'function') {
+      fn = attr;
+      attr = {};
+    }
+    this.tag('ul', attr, function(dom){
+      list.forEach(function(item){
+        dom.out.push('<li>');
+        dom.text(fn ? fn(item) : item);
+        dom.out.push('</li>\n');
+      });
+    });
+  }
+
+};

docs/src/gen-docs.js

@@ -0,0 +1,53 @@
+require.paths.push(__dirname);
+require.paths.push('lib');
+var reader = require('reader.js'),
+    ngdoc = require('ngdoc.js'),
+    writer = require('writer.js'),
+    callback = require('callback.js'),
+    SiteMap = require('SiteMap.js').SiteMap;
+
+var docs = [];
+var start;
+var work = callback.chain(function(){
+  start = now();
+  console.log('Generating Angular Reference Documentation...');
+  reader.collect(work.waitMany(function(text, file, line){
+    var doc = new ngdoc.Doc(text, file, line);
+    docs.push(doc);
+    doc.parse();
+  }));
+});
+var writes = callback.chain(function(){
+  ngdoc.merge(docs);
+  docs.forEach(function(doc){
+    writer.output(doc.id + '.html', doc.html(), writes.waitFor());
+  });
+  var metadata = ngdoc.metadata(docs);
+  writer.output('docs-keywords.js', ['NG_PAGES=', JSON.stringify(metadata).replace(/{/g, '\n{'), ';'], writes.waitFor());
+  writer.copyDir('img', writes.waitFor());
+  writer.copyDir('static', writes.waitFor());
+  writer.copy('index.html', writes.waitFor());
+  writer.copy('docs.js', writes.waitFor());
+  writer.copy('docs.css', writes.waitFor());
+  writer.copy('doc_widgets.js', writes.waitFor());
+  writer.copy('doc_widgets.css', writes.waitFor());
+  writer.copy('docs-scenario.html', writes.waitFor());
+  writer.output('docs-scenario.js', ngdoc.scenarios(docs), writes.waitFor());
+  writer.output('sitemap.xml', new SiteMap(docs).render(), writes.waitFor());
+  writer.output('robots.txt', 'Sitemap: http://docs.angularjs.org/sitemap.xml\n', writes.waitFor());
+  writer.copy('syntaxhighlighter/shBrushJScript.js', writes.waitFor());
+  writer.copy('syntaxhighlighter/shBrushXml.js', writes.waitFor());
+  writer.copy('syntaxhighlighter/shCore.css', writes.waitFor());
+  writer.copy('syntaxhighlighter/shCore.js', writes.waitFor());
+  writer.copy('syntaxhighlighter/shThemeDefault.css', writes.waitFor());
+  writer.copy('jquery.min.js', writes.waitFor());
+});
+writes.onDone(function(){
+  console.log('DONE. Generated ' + docs.length + ' pages in ' +
+      (now()-start) + 'ms.' );
+});
+work.onDone(writes);
+writer.makeDir('build/docs/syntaxhighlighter', work);
+
+///////////////////////////////////
+function now(){ return new Date().getTime(); }

docs/src/ngdoc.js

@@ -0,0 +1,663 @@
+/**
+ * All parsing/transformation code goes here. All code here should be sync to ease testing.
+ */
+
+var Showdown = require('showdown').Showdown;
+var DOM = require('dom.js').DOM;
+var htmlEscape = require('dom.js').htmlEscape;
+var NEW_LINE = /\n\r?/;
+
+exports.trim = trim;
+exports.metadata = metadata;
+exports.scenarios = scenarios;
+exports.merge = merge;
+exports.Doc = Doc;
+
+//////////////////////////////////////////////////////////
+function Doc(text, file, line) {
+  if (typeof text == 'object') {
+    for ( var key in text) {
+      this[key] = text[key];
+    }
+  } else {
+    this.text = text;
+    this.file = file;
+    this.line = line;
+  }
+  this.scenarios = this.scenarios || [];
+  this.requires = this.requires || [];
+  this.param = this.param || [];
+  this.properties = this.properties || [];
+  this.methods = this.methods || [];
+}
+Doc.METADATA_IGNORE = (function(){
+  var words = require('fs').readFileSync(__dirname + '/ignore.words', 'utf8');
+  return words.toString().split(/[,\s\n\r]+/gm);
+})();
+
+
+
+Doc.prototype = {
+  keywords: function keywords(){
+    var keywords = {};
+    Doc.METADATA_IGNORE.forEach(function(ignore){ keywords[ignore] = true; });
+    var words = [];
+    var tokens = this.text.toLowerCase().split(/[,\.\`\'\"\s]+/mg);
+    tokens.forEach(function(key){
+      var match = key.match(/^(([\$\_a-z]|ng\:)[\w\_\-]{2,})/);
+      if (match){
+        key = match[1];
+        if (!keywords[key]) {
+          keywords[key] = true;
+          words.push(key);
+        }
+      }
+    });
+    words.sort();
+    return words.join(' ');
+  },
+
+  markdown: function (text) {
+    var self = this;
+    var IS_URL = /^(https?:\/\/|ftps?:\/\/|mailto:|\.|\/)/;
+    var IS_ANGULAR = /^angular\./;
+    if (!text) return text;
+
+    text = trim(text);
+
+    var parts = text.split(/(<pre>[\s\S]*?<\/pre>|<doc:example>[\s\S]*?<\/doc:example>)/);
+
+    parts.forEach(function(text, i){
+      if (text.match(/^<pre>/)) {
+        text = text.replace(/^<pre>([\s\S]*)<\/pre>/mi, function(_, content){
+          return '<div ng:non-bindable><pre class="brush: js; html-script: true;">' +
+                  content.replace(/</g, '&lt;').replace(/>/g, '&gt;') +
+                 '</pre></div>';
+        });
+      } else if (text.match(/^<doc:example>/)) {
+        text = text.replace(/(<doc:source>)([\s\S]*)(<\/doc:source>)/mi,
+          function(_, before, content, after){
+            return before + htmlEscape(content) + after;
+          });
+        text = text.replace(/(<doc:scenario>)([\s\S]*)(<\/doc:scenario>)/mi,
+          function(_, before, content, after){
+            self.scenarios.push(content);
+            return before + htmlEscape(content) + after;
+          });
+      } else {
+        text = text.replace(/<angular\/>/gm, '<tt>&lt;angular/&gt;</tt>');
+        text = text.replace(/{@link ([^\s}]+)((\s|\n)+(.+?))?\s*}/gm,
+          function(_all, url, _2, _3, title){
+            return '<a href="' + (url.match(IS_URL) ? '' : '#!') + url + '">'
+              + (url.match(IS_ANGULAR) ? '<code>' : '')
+              + (title || url)
+              + (url.match(IS_ANGULAR) ? '</code>' : '')
+              + '</a>';
+          });
+        text = new Showdown.converter().makeHtml(text);
+      }
+      parts[i] = text;
+    });
+    return parts.join('');
+  },
+
+  parse: function(){
+    var atName;
+    var atText;
+    var match;
+    var self = this;
+    self.text.split(NEW_LINE).forEach(function(line){
+      if (match = line.match(/^\s*@(\w+)(\s+(.*))?/)) {
+        // we found @name ...
+        // if we have existing name
+        flush();
+        atName = match[1];
+        atText = [];
+        if(match[3]) atText.push(match[3]);
+      } else {
+        if (atName) {
+          atText.push(line);
+        }
+      }
+    });
+    flush();
+    this.shortName = (this.name || '').split(/[\.#]/).pop();
+    this.id = this.id // if we have an id just use it
+      || (((this.file||'').match(/.*\/([^\/]*)\.ngdoc/)||{})[1]) // try to extract it from file name
+      || this.name; // default to name
+    this.description = this.markdown(this.description);
+    this.example = this.markdown(this.example);
+    this['this'] = this.markdown(this['this']);
+    return this;
+
+    function flush(){
+      if (atName) {
+        var text = trim(atText.join('\n'));
+        if (atName == 'param') {
+          var match = text.match(/^{([^}=]+)(=)?}\s+(([^\s=]+)|\[(\S+)=([^\]]+)\])\s+(.*)/);
+                                //  1      12 2     34       4   5   5 6      6  3   7  7
+          if (!match) {
+            throw new Error("Not a valid 'param' format: " + text);
+          }
+          var param = {
+            name: match[5] || match[4],
+            description:self.markdown(text.replace(match[0], match[7])),
+            type: match[1],
+            optional: !!match[2],
+            'default':match[6]
+          };
+          self.param.push(param);
+        } else if (atName == 'returns') {
+          var match = text.match(/^{([^}=]+)}\s+(.*)/);
+          if (!match) {
+            throw new Error("Not a valid 'returns' format: " + text);
+          }
+          self.returns = {
+            type: match[1],
+            description: self.markdown(text.replace(match[0], match[2]))
+          };
+        } else if(atName == 'requires') {
+          self.requires.push(text);
+        } else if(atName == 'property') {
+          var match = text.match(/^{(\S+)}\s+(\S+)(\s+(.*))?/);
+          if (!match) {
+            throw new Error("Not a valid 'property' format: " + text);
+          }
+          var property = {
+              type: match[1],
+              name: match[2],
+              description: self.markdown(text.replace(match[0], match[4]))
+            };
+          self.properties.push(property);
+        } else {
+          self[atName] = text;
+        }
+      }
+    }
+  },
+
+  html: function(){
+    var dom = new DOM(),
+        self = this;
+
+    dom.h(this.name, function(){
+      notice('workInProgress', 'Work in Progress',
+          'This page is currently being revised. It might be incomplete or contain inaccuracies.');
+      notice('deprecated', 'Deprecated API', self.deprecated);
+
+      (self['html_usage_' + self.ngdoc] || function(){
+        throw new Error("Don't know how to format @ngdoc: " + self.ngdoc);
+      }).call(self, dom);
+
+      dom.h('Example', self.example, dom.html);
+    });
+
+    return dom.toString();
+
+    //////////////////////////
+
+    function notice(name, legend, msg){
+      if (self[name] == undefined) return;
+      dom.tag('fieldset', {'class':name}, function(dom){
+        dom.tag('legend', legend);
+        dom.text(msg);
+      });
+    }
+
+  },
+
+  html_usage_parameters: function(dom) {
+    dom.h('Parameters', this.param, function(param){
+      dom.tag('code', function(){
+        dom.text(param.name);
+        if (param.optional) {
+          dom.tag('i', function(){
+            dom.text('(optional');
+            if(param['default']) {
+              dom.text('=' + param['default']);
+            }
+            dom.text(')');
+          });
+        }
+        dom.text(' – {');
+        dom.text(param.type);
+        dom.text('} – ');
+      });
+      dom.html(param.description);
+    });
+  },
+
+  html_usage_returns: function(dom) {
+    var self = this;
+    if (self.returns) {
+      dom.h('Returns', function(){
+        dom.tag('code', '{' + self.returns.type + '}');
+        dom.text('– ');
+        dom.html(self.returns.description);
+      });
+    }
+  },
+
+  html_usage_this: function(dom) {
+    var self = this;
+    if (self['this']) {
+      dom.h(function(dom){
+        dom.html("Method's <code>this</code>");
+      }, function(dom){
+        dom.html(self['this']);
+      });
+    }
+  },
+
+  html_usage_function: function(dom){
+    var self = this;
+    dom.h('Description', self.description, dom.html);
+    dom.h('Dependencies', self.requires);
+    dom.h('Usage', function(){
+      dom.code(function(){
+        dom.text(self.name);
+        dom.text('(');
+        self.parameters(dom, ', ');
+        dom.text(');');
+      });
+
+      self.html_usage_parameters(dom);
+      self.html_usage_this(dom);
+      self.html_usage_returns(dom);
+    });
+  },
+
+  html_usage_directive: function(dom){
+    var self = this;
+    dom.h('Description', self.description, dom.html);
+    dom.h('Dependencies', self.requires);
+    dom.h('Usage', function(){
+      dom.tag('pre', {'class':"brush: js; html-script: true;"}, function(){
+        dom.text('<' + self.element + ' ');
+        dom.text(self.shortName);
+        if (self.param.length) {
+          dom.text('="' + self.param[0].name + '"');
+        }
+        dom.text('>\n   ...\n');
+        dom.text('</' + self.element + '>');
+      });
+      self.html_usage_parameters(dom);
+    });
+  },
+
+  html_usage_filter: function(dom){
+    var self = this;
+    dom.h('Description', self.description, dom.html);
+    dom.h('Dependencies', self.requires);
+    dom.h('Usage', function(){
+      dom.h('In HTML Template Binding', function(){
+        dom.tag('code', function(){
+          dom.text('{{ ');
+          dom.text(self.shortName);
+          dom.text('_expression | ');
+          dom.text(self.shortName);
+          self.parameters(dom, ':', true);
+          dom.text(' }}');
+        });
+      });
+
+      dom.h('In JavaScript', function(){
+        dom.tag('code', function(){
+          dom.text('angular.filter.');
+          dom.text(self.shortName);
+          dom.text('(');
+          self.parameters(dom, ', ');
+          dom.text(')');
+        });
+      });
+
+      self.html_usage_parameters(dom);
+      self.html_usage_this(dom);
+      self.html_usage_returns(dom);
+    });
+  },
+
+  html_usage_formatter: function(dom){
+    var self = this;
+    dom.h('Description', self.description, dom.html);
+    dom.h('Dependencies', self.requires);
+    dom.h('Usage', function(){
+      dom.h('In HTML Template Binding', function(){
+        dom.code(function(){
+          if (self.inputType=='select')
+            dom.text('<select name="bindExpression"');
+          else
+            dom.text('<input type="text" name="bindExpression"');
+          dom.text(' ng:format="');
+          dom.text(self.shortName);
+          self.parameters(dom, ':', false, true);
+          dom.text('">');
+        });
+      });
+
+      dom.h('In JavaScript', function(){
+        dom.code(function(){
+          dom.text('var userInputString = angular.formatter.');
+          dom.text(self.shortName);
+          dom.text('.format(modelValue');
+          self.parameters(dom, ', ', false, true);
+          dom.text(');');
+          dom.text('\n');
+          dom.text('var modelValue = angular.formatter.');
+          dom.text(self.shortName);
+          dom.text('.parse(userInputString');
+          self.parameters(dom, ', ', false, true);
+          dom.text(');');
+        });
+      });
+
+      self.html_usage_parameters(dom);
+      self.html_usage_this(dom);
+      self.html_usage_returns(dom);
+    });
+  },
+
+  html_usage_validator: function(dom){
+    var self = this;
+    dom.h('Description', self.description, dom.html);
+    dom.h('Dependencies', self.requires);
+    dom.h('Usage', function(){
+      dom.h('In HTML Template Binding', function(){
+        dom.code(function(){
+          dom.text('<input type="text" ng:validate="');
+          dom.text(self.shortName);
+          self.parameters(dom, ':', true);
+          dom.text('"/>');
+        });
+      });
+
+      dom.h('In JavaScript', function(){
+        dom.code(function(){
+          dom.text('angular.validator.');
+          dom.text(self.shortName);
+          dom.text('(');
+          self.parameters(dom, ', ');
+          dom.text(')');
+        });
+      });
+
+      self.html_usage_parameters(dom);
+      self.html_usage_this(dom);
+      self.html_usage_returns(dom);
+    });
+  },
+
+  html_usage_widget: function(dom){
+    var self = this;
+    dom.h('Description', self.description, dom.html);
+    dom.h('Dependencies', self.requires);
+    dom.h('Usage', function(){
+      dom.h('In HTML Template Binding', function(){
+        dom.code(function(){
+          if (self.shortName.match(/^@/)) {
+            dom.text('<');
+            dom.text(self.element);
+            dom.text(' ');
+            dom.text(self.shortName.substring(1));
+            if (self.param.length) {
+              dom.text('="');
+              dom.text(self.param[0].name);
+              dom.text('"');
+            }
+            dom.text('>\n   ...\n</');
+            dom.text(self.element);
+            dom.text('>');
+          } else {
+            dom.text('<');
+            dom.text(self.shortName);
+            (self.param||[]).forEach(function(param){
+              if (param.optional) {
+                dom.text(' [' + param.name + '="..."]');
+              } else {
+                dom.text(' ' + param.name + '="..."');
+              }
+            });
+            dom.text('></');
+            dom.text(self.shortName);
+            dom.text('>');
+          }
+        });
+      });
+
+      self.html_usage_parameters(dom);
+      self.html_usage_returns(dom);
+    });
+  },
+
+  html_usage_overview: function(dom){
+    dom.html(this.description);
+  },
+
+  html_usage_service: function(dom){
+    var self = this;
+    dom.h('Description', this.description, dom.html);
+    dom.h('Dependencies', this.requires);
+
+    if (this.param.length) {
+      dom.h('Usage', function(){
+        dom.code(function(){
+          dom.text(self.name.split('.').pop());
+          dom.text('(');
+          self.parameters(dom, ', ');
+          dom.text(');');
+        });
+
+        self.html_usage_parameters(dom);
+        self.html_usage_this(dom);
+        self.html_usage_returns(dom);
+      });
+    }
+
+    dom.h('Methods', this.methods, function(method){
+      var signature = (method.param || []).map(property('name'));
+      dom.h(method.shortName + '(' + signature.join(', ') + ')', method, function(){
+        dom.html(method.description);
+        method.html_usage_parameters(dom);
+        dom.h('Example', method.example, dom.html);
+      });
+    });
+    dom.h('Properties', this.properties, function(property){
+      dom.h(property.name, function(){
+       dom.html(property.description);
+       dom.h('Example', property.example, dom.html);
+      });
+    });
+  },
+
+  parameters: function(dom, separator, skipFirst, prefix) {
+    var sep = prefix ? separator : '';
+    (this.param||[]).forEach(function(param, i){
+      if (!(skipFirst && i==0)) {
+        if (param.optional) {
+          dom.text('[' + sep + param.name + ']');
+        } else {
+          dom.text(sep + param.name);
+        }
+      }
+      sep = separator;
+    });
+  }
+
+};
+//////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////
+function scenarios(docs){
+  var specs = [];
+  docs.forEach(function(doc){
+    specs.push('describe("' + doc.id + '", function(){');
+    specs.push('  beforeEach(function(){');
+    specs.push('    browser().navigateTo("index.html#!' + doc.id + '");');
+    specs.push('  });');
+    specs.push('');
+    doc.scenarios.forEach(function(scenario){
+      specs.push(indent(trim(scenario), 2));
+      specs.push('');
+    });
+    specs.push('});');
+    specs.push('');
+    if (doc.scenario) {
+    }
+  });
+  return specs.join('\n');
+}
+
+
+//////////////////////////////////////////////////////////
+function metadata(docs){
+  var words = [];
+  docs.forEach(function(doc){
+    var path = (doc.name || '').split(/(\.|\:\s+)/);
+    for ( var i = 1; i < path.length; i++) {
+      path.splice(i, 1);
+    }
+    var depth = path.length - 1;
+    var shortName = path.pop();
+    words.push({
+      id: doc.id,
+      name: doc.name,
+      depth: depth,
+      shortName: shortName,
+      type: doc.ngdoc,
+      keywords:doc.keywords()
+    });
+  });
+  words.sort(keywordSort);
+  return words;
+}
+
+var KEYWORD_PRIORITY = {
+  '.started': 1,
+  '.guide': 2,
+  '.guide.overview': 1,
+  '.angular': 7,
+  '.angular.Array': 7,
+  '.angular.Object': 7,
+  '.angular.directive': 7,
+  '.angular.filter': 7,
+  '.angular.formatter': 7,
+  '.angular.scope': 7,
+  '.angular.service': 7,
+  '.angular.validator': 7,
+  '.angular.widget': 7
+};
+function keywordSort(a, b){
+  function mangleName(doc) {
+    var path = doc.id.split(/\./);
+    var mangled = [];
+    var partialName = '';
+    path.forEach(function(name){
+      partialName += '.' + name;
+      mangled.push(KEYWORD_PRIORITY[partialName] || 5);
+      mangled.push(name);
+    });
+    return mangled.join('.');
+  }
+  var nameA = mangleName(a);
+  var nameB = mangleName(b);
+  return nameA < nameB ? -1 : (nameA > nameB ? 1 : 0);
+}
+
+
+//////////////////////////////////////////////////////////
+function trim(text) {
+  var MAX_INDENT = 9999;
+  var empty = RegExp.prototype.test.bind(/^\s*$/);
+  var lines = text.split('\n');
+  var minIndent = MAX_INDENT;
+  var indentRegExp;
+  var ignoreLine = (lines[0][0] != ' '  && lines.length > 1);
+                  // ignore first line if it has no indentation and there is more than one line
+
+  lines.forEach(function(line){
+    if (ignoreLine) {
+      ignoreLine = false;
+      return;
+    }
+
+    var indent = line.match(/^\s*/)[0].length;
+    if (indent > 0 || minIndent == MAX_INDENT) {
+      minIndent = Math.min(minIndent, indent);
+    }
+  });
+
+  indentRegExp = new RegExp('^\\s{0,' + minIndent + '}');
+
+  for ( var i = 0; i < lines.length; i++) {
+    lines[i] = lines[i].replace(indentRegExp, '');
+  }
+
+  // remove leading lines
+  while (empty(lines[0])) {
+    lines.shift();
+  }
+
+  // remove trailing
+  while (empty(lines[lines.length - 1])) {
+    lines.pop();
+  }
+  return lines.join('\n');
+}
+
+function indent(text, spaceCount) {
+  var lines = text.split('\n'),
+      indent = '',
+      fixedLines = [];
+
+  while(spaceCount--) indent += ' ';
+
+  lines.forEach(function(line) {
+    fixedLines.push(indent + line);
+  });
+
+  return fixedLines.join('\n');
+}
+
+//////////////////////////////////////////////////////////
+function merge(docs){
+  var byName = {};
+  docs.forEach(function(doc){
+    byName[doc.name] = doc;
+  });
+  for(var i=0; i<docs.length;) {
+    if (findParent(docs[i], 'method') ||
+          findParent(docs[i], 'property')) {
+      docs.splice(i, 1);
+    } else {
+      i++;
+    }
+  }
+
+  function findParent(doc, name){
+    var parentName = doc[name+'Of'];
+    if (!parentName) return false;
+
+    var parent = byName[parentName];
+    if (!parent)
+      throw new Error("No parent named '" + parentName + "' for '" +
+          doc.name + "' in @" + name + "Of.");
+
+    var listName = (name + 's').replace(/ys$/, 'ies');
+    var list = parent[listName] = (parent[listName] || []);
+    list.push(doc);
+    list.sort(orderByName);
+    return true;
+  }
+
+  function orderByName(a, b){
+    return a.name < b.name ? -1 : (a.name > b.name ? 1 : 0);
+  }
+}
+//////////////////////////////////////////////////////////
+
+function property(name) {
+  return function(value){
+    return value[name];
+  };
+}

docs/src/reader.js

@@ -0,0 +1,91 @@
+/**
+ * All reading related code here. This is so that we can separate the async code from sync code
+ * for testability
+ */
+require.paths.push(__dirname);
+var fs       = require('fs'),
+    callback = require('callback');
+
+var NEW_LINE = /\n\r?/;
+
+function collect(callback){
+  findJsFiles('src', callback.waitMany(function(file) {
+    //console.log('reading', file, '...');
+    findNgDocInJsFile(file, callback.waitMany(function(doc, line) {
+      callback(doc, file, line);
+    }));
+  }));
+  findNgDocInDir('docs/', callback.waitMany(callback));
+  callback.done();
+}
+
+function findJsFiles(dir, callback){
+  fs.readdir(dir, callback.waitFor(function(err, files){
+    if (err) return this.error(err);
+    files.forEach(function(file){
+      var path = dir + '/' + file;
+      fs.lstat(path, callback.waitFor(function(err, stat){
+        if (err) return this.error(err);
+        if (stat.isDirectory())
+          findJsFiles(path, callback.waitMany(callback));
+        else if (/\.js$/.test(path))
+          callback(path);
+      }));
+    });
+    callback.done();
+  }));
+}
+
+function findNgDocInDir(directory, docNotify) {
+  fs.readdir(directory, docNotify.waitFor(function(err, files){
+    if (err) return this.error(err);
+    files.forEach(function(file){
+      //console.log('reading', directory + file, '...');
+      if (!file.match(/\.ngdoc$/)) return;
+      fs.readFile(directory + file, docNotify.waitFor(function(err, content){
+        if (err) return this.error(err);
+        docNotify(content.toString(), directory + file, 1);
+      }));
+    });
+    docNotify.done();
+  }));
+}
+
+function findNgDocInJsFile(file, callback) {
+  fs.readFile(file, callback.waitFor(function(err, content){
+    var lines = content.toString().split(NEW_LINE);
+    var text;
+    var startingLine ;
+    var match;
+    var inDoc = false;
+    lines.forEach(function(line, lineNumber){
+      lineNumber++;
+      // is the comment starting?
+      if (!inDoc && (match = line.match(/^\s*\/\*\*\s*(.*)$/))) {
+        line = match[1];
+        inDoc = true;
+        text = [];
+        startingLine = lineNumber;
+      }
+      // are we done?
+      if (inDoc && line.match(/\*\//)) {
+        text = text.join('\n');
+        text = text.replace(/^\n/, '');
+        if (text.match(/@ngdoc/)){
+          callback(text, startingLine);
+        }
+        doc = null;
+        inDoc = false;
+      }
+      // is the comment add text
+      if (inDoc){
+        text.push(line.replace(/^\s*\*\s?/, ''));
+      }
+    });
+    callback.done();
+  }));
+}
+
+
+
+exports.collect = collect;

docs/src/templates/doc_widgets.css

@@ -32,4 +32,4 @@ li.doc-example-live {
 
 div.syntaxhighlighter {
   padding-bottom: 1px !important; /* fix to remove unnecessary scrollbars http://is.gd/gSMgC */
-}
+}

docs/src/templates/doc_widgets.js

@@ -0,0 +1,88 @@
+(function(){
+
+  var angularJsUrl;
+  var scripts = document.getElementsByTagName("script");
+  var angularJsRegex = /^(|.*\/)angular(-.*?)?(\.min)?.js(\?[^#]*)?(#(.*))?$/
+  for(var j = 0; j < scripts.length; j++) {
+    var src = scripts[j].src;
+    if (src && src.match(angularJsRegex)) {
+      angularJsUrl = src.replace('docs.angularjs.org', 'code.angularjs.org');
+      continue;
+    }
+  }
+
+
+  var HTML_TEMPLATE =
+  '<!doctype html>\n' +
+  '<html xmlns:ng="http://angularjs.org">\n' +
+  ' <script src="' + angularJsUrl + '" ng:autobind></script>\n' +
+  ' <body>\n' +
+  '_HTML_SOURCE_\n' +
+  ' </body>\n' +
+  '</html>';
+
+  angular.widget('doc:example', function(element){
+    this.descend(true); //compile the example code
+    element.hide();
+
+    var example = element.find('doc\\:source').eq(0),
+        exampleSrc = example.text(),
+        scenario = element.find('doc\\:scenario').eq(0);
+
+    var code = indent(exampleSrc);
+    var tabHtml =
+      '<ul class="doc-example">' +
+        '<li class="doc-example-heading"><h3>Source</h3></li>' +
+        '<li class="doc-example-source" ng:non-bindable>' +
+          '<pre class="brush: js; html-script: true; highlight: [' +
+          code.hilite + ']; toolbar: false;"></pre></li>' +
+        '<li class="doc-example-heading"><h3>Live Preview</h3></li>' +
+        '<li class="doc-example-live">' + exampleSrc +'</li>';
+    if (scenario.text()) {
+      tabHtml +=
+        '<li class="doc-example-heading"><h3>Scenario Test</h3></li>' +
+        '<li class="doc-example-scenario"><pre class="brush: js">' + scenario.text() + '</pre></li>';
+    }
+    tabHtml +=
+      '</ul>';
+    var tabs = angular.element(tabHtml);
+
+    tabs.find('li.doc-example-source > pre').text(HTML_TEMPLATE.replace('_HTML_SOURCE_', code.html));
+
+    element.html('');
+    element.append(tabs);
+    element.show();
+
+    var script = (exampleSrc.match(/<script[^\>]*>([\s\S]*)<\/script>/) || [])[1] || '';
+    try {
+      eval(script);
+    } catch (e) {
+      alert(e);
+    }
+  });
+
+  function indent(text) {
+    if (!text) return text;
+    var lines = text.split(/\n/);
+    var lineNo = [];
+    // remove any leading blank lines
+    while (lines[0].match(/^\s*$/)) lines.shift();
+    // remove any trailing blank lines
+    while (lines[lines.length - 1].match(/^\s*$/)) lines.pop();
+    var minIndent = 999;
+    for ( var i = 0; i < lines.length; i++) {
+      var line = lines[0];
+      var indent = line.match(/^\s*/)[0];
+      if (indent !== line && indent.length < minIndent) {
+        minIndent = indent.length;
+      }
+    }
+
+    for ( var i = 0; i < lines.length; i++) {
+      lines[i] = '  ' + lines[i].substring(minIndent);
+      lineNo.push(5 + i);
+    }
+    return {html: lines.join('\n'), hilite: lineNo.join(',') };
+  };
+
+})();

docs/src/templates/docs-scenario.html

@@ -7,4 +7,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

docs/src/templates/docs.css

@@ -100,6 +100,34 @@ a {
   margin-top: 1.5em;
 }
 
+#main ul.methods,
+#main ul.properties {
+  margin: 0;
+  padding-left: 1em;
+}
+
+#main ul.methods > li,
+#main ul.properties > li {
+  list-style: none;
+  padding: 0 10px 10px 10px;
+  margin-top: 1.5em;
+  border: 1px solid #000;
+}
+
+#main ul.methods > li > h3,
+#main ul.properties > li > h3 {
+  font-family: "Courier New", monospace;
+  background-color: #E0E0E0;
+  margin: 0 -10px 5px -10px;
+  padding: .5em .5em .25em .5em;
+  border-bottom: 1px solid #888;
+}
+
+#main li > p,
+#main div.returns > p {
+  display: inline; /* the top most paragraph should not cause new lines inside lists. */
+}
+
 .main-title {
   float: right;
 }
@@ -142,7 +170,7 @@ a {
 #sidebar ul li a {
   display: block;
   padding: 2px 2px 2px 4px;
-} 
+}
 
 #sidebar ul li.selected a {
   background-color: #DDD;
@@ -153,11 +181,16 @@ a {
 }
 
 #sidebar ul li.level-0 {
+  margin-top: 0.5em;
   margin-left: 0em;
   font-weight: bold;
   font-size: 1.2em;
 }
 
+#sidebar ul li.level-0:first-child {
+  margin-top: 0;
+}
+
 #sidebar ul li.level-1.level-angular {
   font-family: monospace;
   font-weight: normal;
@@ -183,6 +216,11 @@ a {
   font-family: monospace;
 }
 
+#sidebar ul li.level-4 {
+  margin-left: 4em;
+  font-family: monospace;
+}
+
 
 /* Warning and Info Banners */
 
@@ -254,3 +292,11 @@ a {
 #main::-webkit-scrollbar {
   background-color:#fff;
 }
+
+/* Content */
+img.right {
+  float: right;
+}
+h1, h2, h3, h4, h5 {
+  clear: both;
+}

docs/src/templates/docs.js

@@ -1,29 +1,32 @@
-SyntaxHighlighter['defaults'].toolbar = false;
-
+var HAS_HASH = /#/;
 DocsController.$inject = ['$location', '$browser', '$window'];
 function DocsController($location, $browser, $window) {
   this.pages = NG_PAGES;
   window.$root = this.$root;
-  
+  this.$location = $location;
+
+  if (!HAS_HASH.test($location.href)) {
+    $location.hashPath = '!angular';
+  }
+
+  this.$watch('$location.hashPath', function(hashPath) {
+    if (hashPath.match(/^!/)) {
+      this.partialId = hashPath.substring(1);
+      this.partialTitle = (angular.Array.filter(NG_PAGES, {id:this.partialId})[0]||{}).name;
+    }
+  });
+
   this.getUrl = function(page){
-    return '#!' + page.name;
+    return '#!' + page.id;
   };
 
   this.getCurrentPartial = function(){
-    return './' + this.getTitle() + '.html';
+    return './' + this.partialId + '.html';
   };
-  
-  this.getTitle = function(){
-    var hashPath = $location.hashPath || '!angular';
-    if (hashPath.match(/^!angular/)) {
-      this.partialTitle = hashPath.substring(1);
-    }
-    return this.partialTitle;
-  };
-  
+
   this.getClass = function(page) {
-    var depth = page.name.split(/\./).length - 1,
-        cssClass = 'level-' + depth + (page.name == this.getTitle() ? ' selected' : '');
+    var depth = page.depth,
+        cssClass = 'level-' + depth + (page.name == this.partialId ? ' selected' : '');
 
     if (depth == 1 && page.type !== 'overview') cssClass += ' level-angular';
 
@@ -38,10 +41,13 @@ function DocsController($location, $browser, $window) {
     return "mailto:angular@googlegroups.com?" +
            "subject=" + escape("Feedback on " + $location.href) + "&" +
            "body=" + escape("Hi there,\n\nI read " + $location.href + " and wanted to ask ....");
-  }
-  
+  };
+
 }
 
-angular.filter('short', function(name){
-  return (name||'').split(/\./).pop();
-});
+// prevent compilation of code
+angular.widget('code', function(element){
+  element.attr('ng:non-bindable', 'true');
+});
+
+SyntaxHighlighter['defaults'].toolbar = false;

docs/src/templates/index.html

@@ -3,37 +3,38 @@
       xmlns:doc="http://docs.angularjs.org/"
       ng:controller="DocsController">
 <head>
-  <title ng:bind-template="&lt;angular/&gt;: {{getTitle()}}">&lt;angular/&gt;</title>
+  <title ng:bind-template="&lt;angular/&gt;: {{partialTitle}}">&lt;angular/&gt;</title>
 
   <meta name="fragment" content="!">
 
   <link rel="stylesheet" href="doc_widgets.css" type="text/css" />
   <link rel="stylesheet" href="docs.css" type="text/css"/>
-  <link rel="stylesheet" href="http://alexgorbatchev.com/pub/sh/current/styles/shCore.css" type="text/css"/>
-  <link rel="stylesheet" href="http://alexgorbatchev.com/pub/sh/current/styles/shThemeDefault.css" type="text/css"/>
+  <link rel="stylesheet" href="syntaxhighlighter/shCore.css" type="text/css"/>
+  <link rel="stylesheet" href="syntaxhighlighter/shThemeDefault.css" type="text/css"/>
 
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"></script>
-  <script src="http://alexgorbatchev.com/pub/sh/current/scripts/shCore.js"></script>
-  <script src="http://alexgorbatchev.com/pub/sh/current/scripts/shBrushJScript.js"></script>
-  <script src="http://alexgorbatchev.com/pub/sh/current/scripts/shBrushXml.js"></script>
+  <script src="jquery.min.js"></script>
+  <script src="syntaxhighlighter/shCore.js"></script>
+  <script src="syntaxhighlighter/shBrushJScript.js"></script>
+  <script src="syntaxhighlighter/shBrushXml.js"></script>
 
   <script src="../angular.min.js" ng:autobind></script>
   <script src="docs.js"></script>
   <script src="doc_widgets.js"></script>
-  <script src="docs-data.js"></script>
+  <script src="docs-keywords.js"></script>
 </head>
 <body style="display:none;" ng:show="true">
   <div id="header">
     <h1>
-      <span class="main-title">{{getTitle()}}</span>
-      <a href="#"><span class="angular">&lt;angular/&gt;</span> Docs</a>
+      <span class="main-title">{{partialTitle}}</span>
+      <a href="#" tabindex="0"><span class="angular">&lt;angular/&gt;</span> Docs</a>
     </h1>
   </div>
   <div id="sidebar">
-    <input type="text" name="search" id="search-box" placeholder="search the docs"/>
+    <input type="text" name="search" id="search-box" placeholder="search the docs"
+           tabindex="1" accesskey="s"/>
     <ul id="api-list">
       <li ng:repeat="page in pages.$filter(search)" ng:class="getClass(page)">
-        <a href="{{getUrl(page)}}" ng:click="">{{page.name | short}}</a>
+        <a href="{{getUrl(page)}}" ng:click="" tabindex="2">{{page.shortName}}</a>
       </li>
     </ul>
   </div>

docs/src/templates/jquery.min.js

@@ -0,0 +1 @@
+../../../lib/jquery/jquery-1.4.2.min.js

docs/src/templates/syntaxhighlighter/shBrushJScript.js

@@ -0,0 +1,52 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+	// CommonJS
+	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+	function Brush()
+	{
+		var keywords =	'break case catch continue ' +
+						'default delete do else false  ' +
+						'for function if in instanceof ' +
+						'new null return super switch ' +
+						'this throw true try typeof var while with'
+						;
+
+		var r = SyntaxHighlighter.regexLib;
+
+		this.regexList = [
+			{ regex: r.multiLineDoubleQuotedString,					css: 'string' },			// double quoted strings
+			{ regex: r.multiLineSingleQuotedString,					css: 'string' },			// single quoted strings
+			{ regex: r.singleLineCComments,							css: 'comments' },			// one line comments
+			{ regex: r.multiLineCComments,							css: 'comments' },			// multiline comments
+			{ regex: /\s*#.*/gm,									css: 'preprocessor' },		// preprocessor tags like #region and #endregion
+			{ regex: new RegExp(this.getKeywords(keywords), 'gm'),	css: 'keyword' }			// keywords
+			];
+
+		this.forHtmlScript(r.scriptScriptTags);
+	};
+
+	Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['js', 'jscript', 'javascript'];
+
+	SyntaxHighlighter.brushes.JScript = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();

docs/src/templates/syntaxhighlighter/shBrushXml.js

@@ -0,0 +1,69 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+	// CommonJS
+	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+	function Brush()
+	{
+		function process(match, regexInfo)
+		{
+			var constructor = SyntaxHighlighter.Match,
+				code = match[0],
+				tag = new XRegExp('(&lt;|<)[\\s\\/\\?]*(?<name>[:\\w-\\.]+)', 'xg').exec(code),
+				result = []
+				;
+
+			if (match.attributes != null)
+			{
+				var attributes,
+					regex = new XRegExp('(?<name> [\\w:\\-\\.]+)' +
+										'\\s*=\\s*' +
+										'(?<value> ".*?"|\'.*?\'|\\w+)',
+										'xg');
+
+				while ((attributes = regex.exec(code)) != null)
+				{
+					result.push(new constructor(attributes.name, match.index + attributes.index, 'color1'));
+					result.push(new constructor(attributes.value, match.index + attributes.index + attributes[0].indexOf(attributes.value), 'string'));
+				}
+			}
+
+			if (tag != null)
+				result.push(
+					new constructor(tag.name, match.index + tag[0].indexOf(tag.name), 'keyword')
+				);
+
+			return result;
+		}
+
+		this.regexList = [
+			{ regex: new XRegExp('(\\&lt;|<)\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\](\\&gt;|>)', 'gm'),			css: 'color2' },	// <![ ... [ ... ]]>
+			{ regex: SyntaxHighlighter.regexLib.xmlComments,												css: 'comments' },	// <!-- ... -->
+			{ regex: new XRegExp('(&lt;|<)[\\s\\/\\?]*(\\w+)(?<attributes>.*?)[\\s\\/\\?]*(&gt;|>)', 'sg'), func: process }
+		];
+	};
+
+	Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['xml', 'xhtml', 'xslt', 'html'];
+
+	SyntaxHighlighter.brushes.Xml = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();

docs/src/templates/syntaxhighlighter/shCore.css

@@ -0,0 +1,226 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,
+.syntaxhighlighter div,
+.syntaxhighlighter code,
+.syntaxhighlighter table,
+.syntaxhighlighter table td,
+.syntaxhighlighter table tr,
+.syntaxhighlighter table tbody,
+.syntaxhighlighter table thead,
+.syntaxhighlighter table caption,
+.syntaxhighlighter textarea {
+  -moz-border-radius: 0 0 0 0 !important;
+  -webkit-border-radius: 0 0 0 0 !important;
+  background: none !important;
+  border: 0 !important;
+  bottom: auto !important;
+  float: none !important;
+  height: auto !important;
+  left: auto !important;
+  line-height: 1.1em !important;
+  margin: 0 !important;
+  outline: 0 !important;
+  overflow: visible !important;
+  padding: 0 !important;
+  position: static !important;
+  right: auto !important;
+  text-align: left !important;
+  top: auto !important;
+  vertical-align: baseline !important;
+  width: auto !important;
+  box-sizing: content-box !important;
+  font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
+  font-weight: normal !important;
+  font-style: normal !important;
+  font-size: 1em !important;
+  min-height: inherit !important;
+  min-height: auto !important;
+}
+
+.syntaxhighlighter {
+  width: 100% !important;
+  margin: 1em 0 1em 0 !important;
+  position: relative !important;
+  overflow: auto !important;
+  font-size: 1em !important;
+}
+.syntaxhighlighter.source {
+  overflow: hidden !important;
+}
+.syntaxhighlighter .bold {
+  font-weight: bold !important;
+}
+.syntaxhighlighter .italic {
+  font-style: italic !important;
+}
+.syntaxhighlighter .line {
+  white-space: pre !important;
+}
+.syntaxhighlighter table {
+  width: 100% !important;
+}
+.syntaxhighlighter table caption {
+  text-align: left !important;
+  padding: .5em 0 0.5em 1em !important;
+}
+.syntaxhighlighter table td.code {
+  width: 100% !important;
+}
+.syntaxhighlighter table td.code .container {
+  position: relative !important;
+}
+.syntaxhighlighter table td.code .container textarea {
+  box-sizing: border-box !important;
+  position: absolute !important;
+  left: 0 !important;
+  top: 0 !important;
+  width: 100% !important;
+  height: 100% !important;
+  border: none !important;
+  background: white !important;
+  padding-left: 1em !important;
+  overflow: hidden !important;
+  white-space: pre !important;
+}
+.syntaxhighlighter table td.gutter .line {
+  text-align: right !important;
+  padding: 0 0.5em 0 1em !important;
+}
+.syntaxhighlighter table td.code .line {
+  padding: 0 1em !important;
+}
+.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line {
+  padding-left: 0em !important;
+}
+.syntaxhighlighter.show {
+  display: block !important;
+}
+.syntaxhighlighter.collapsed table {
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+  padding: 0.1em 0.8em 0em 0.8em !important;
+  font-size: 1em !important;
+  position: static !important;
+  width: auto !important;
+  height: auto !important;
+}
+.syntaxhighlighter.collapsed .toolbar span {
+  display: inline !important;
+  margin-right: 1em !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a {
+  padding: 0 !important;
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar {
+  position: absolute !important;
+  right: 1px !important;
+  top: 1px !important;
+  width: 11px !important;
+  height: 11px !important;
+  font-size: 10px !important;
+  z-index: 10 !important;
+}
+.syntaxhighlighter .toolbar span.title {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar a {
+  display: block !important;
+  text-align: center !important;
+  text-decoration: none !important;
+  padding-top: 1px !important;
+}
+.syntaxhighlighter .toolbar a.expandSource {
+  display: none !important;
+}
+.syntaxhighlighter.ie {
+  font-size: .9em !important;
+  padding: 1px 0 1px 0 !important;
+}
+.syntaxhighlighter.ie .toolbar {
+  line-height: 8px !important;
+}
+.syntaxhighlighter.ie .toolbar a {
+  padding-top: 0px !important;
+}
+.syntaxhighlighter.printing .line.alt1 .content,
+.syntaxhighlighter.printing .line.alt2 .content,
+.syntaxhighlighter.printing .line.highlighted .number,
+.syntaxhighlighter.printing .line.highlighted.alt1 .content,
+.syntaxhighlighter.printing .line.highlighted.alt2 .content {
+  background: none !important;
+}
+.syntaxhighlighter.printing .line .number {
+  color: #bbbbbb !important;
+}
+.syntaxhighlighter.printing .line .content {
+  color: black !important;
+}
+.syntaxhighlighter.printing .toolbar {
+  display: none !important;
+}
+.syntaxhighlighter.printing a {
+  text-decoration: none !important;
+}
+.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a {
+  color: black !important;
+}
+.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a {
+  color: #008200 !important;
+}
+.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a {
+  color: blue !important;
+}
+.syntaxhighlighter.printing .keyword {
+  color: #006699 !important;
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .preprocessor {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter.printing .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter.printing .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter.printing .script {
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a {
+  color: red !important;
+}
+.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a {
+  color: black !important;
+}

docs/src/templates/syntaxhighlighter/shThemeDefault.css

@@ -0,0 +1,117 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter {
+  background-color: white !important;
+}
+.syntaxhighlighter .line.alt1 {
+  background-color: white !important;
+}
+.syntaxhighlighter .line.alt2 {
+  background-color: white !important;
+}
+.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 {
+  background-color: #e0e0e0 !important;
+}
+.syntaxhighlighter .line.highlighted.number {
+  color: black !important;
+}
+.syntaxhighlighter table caption {
+  color: black !important;
+}
+.syntaxhighlighter .gutter {
+  color: #afafaf !important;
+}
+.syntaxhighlighter .gutter .line {
+  border-right: 3px solid #6ce26c !important;
+}
+.syntaxhighlighter .gutter .line.highlighted {
+  background-color: #6ce26c !important;
+  color: white !important;
+}
+.syntaxhighlighter.printing .line .content {
+  border: none !important;
+}
+.syntaxhighlighter.collapsed {
+  overflow: visible !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+  color: blue !important;
+  background: white !important;
+  border: 1px solid #6ce26c !important;
+}
+.syntaxhighlighter.collapsed .toolbar a {
+  color: blue !important;
+}
+.syntaxhighlighter.collapsed .toolbar a:hover {
+  color: red !important;
+}
+.syntaxhighlighter .toolbar {
+  color: white !important;
+  background: #6ce26c !important;
+  border: none !important;
+}
+.syntaxhighlighter .toolbar a {
+  color: white !important;
+}
+.syntaxhighlighter .toolbar a:hover {
+  color: black !important;
+}
+.syntaxhighlighter .plain, .syntaxhighlighter .plain a {
+  color: black !important;
+}
+.syntaxhighlighter .comments, .syntaxhighlighter .comments a {
+  color: #008200 !important;
+}
+.syntaxhighlighter .string, .syntaxhighlighter .string a {
+  color: blue !important;
+}
+.syntaxhighlighter .keyword {
+  color: #006699 !important;
+}
+.syntaxhighlighter .preprocessor {
+  color: gray !important;
+}
+.syntaxhighlighter .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter .script {
+  font-weight: bold !important;
+  color: #006699 !important;
+  background-color: none !important;
+}
+.syntaxhighlighter .color1, .syntaxhighlighter .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter .color2, .syntaxhighlighter .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .color3, .syntaxhighlighter .color3 a {
+  color: red !important;
+}
+
+.syntaxhighlighter .keyword {
+  font-weight: bold !important;
+}

docs/src/templates/syntaxhighlighter/version.txt

@@ -0,0 +1,2 @@
+3.0.83
+

docs/src/writer.js

@@ -0,0 +1,74 @@
+/**
+ * All writing related code here. This is so that we can separate the async code from sync code
+ * for testability
+ */
+require.paths.push(__dirname);
+var fs         = require('fs');
+var OUTPUT_DIR = "build/docs/";
+
+function output(docs, content, callback){
+  callback();
+}
+
+exports.output = function(file, content, callback){
+  //console.log('writing', OUTPUT_DIR + file, '...');
+  fs.writeFile(
+      OUTPUT_DIR + file,
+      exports.toString(content),
+      callback);
+};
+
+
+exports.toString = function toString(obj){
+  switch (typeof obj) {
+  case 'string':
+    return obj;
+  case 'object':
+    if (obj instanceof Array) {
+      obj.forEach(function (value, key){
+        obj[key] = toString(value);
+      });
+      return obj.join('');
+    } else {
+      return JSON.stringify(obj);
+    }
+  }
+  return obj;
+};
+
+exports.makeDir = function (path, callback) {
+  var parts = path.split(/\//);
+  path = '.';
+  (function next(){
+    if (parts.length) {
+      path += '/' + parts.shift();
+      fs.mkdir(path, 0777, next);
+    } else {
+      callback();
+    }
+  })();
+};
+
+exports.copy = function(filename, callback){
+  copy('docs/src/templates/' + filename, OUTPUT_DIR + filename, callback);
+};
+
+function copy(from, to, callback) {
+  //console.log('writing', to, '...');
+  fs.readFile(from, function(err, content){
+    if (err) return callback.error(err);
+    fs.writeFile(to, content, callback);
+  });
+}
+
+exports.copyDir = function(dir, callback) {
+  exports.makeDir(OUTPUT_DIR + '/' + dir, callback.waitFor(function(){
+    fs.readdir('docs/' + dir, callback.waitFor(function(err, files){
+      if (err) return this.error(err);
+      files.forEach(function(file){
+        copy('docs/' + dir + '/' + file, OUTPUT_DIR  + '/' + dir + '/' + file, callback.waitFor());
+      });
+      callback();
+    }));
+  }));
+};

docs/started.ngdoc

@@ -0,0 +1,122 @@
+@workInProgress
+@ngdoc overview
+@name Getting Started
+@description
+
+# Hello World
+The easiest way to get started with angular is to create a basic Hello World app.
+
+# Step 1
+
+In your favorite text editor, create a file called helloworld.html. Copy and paste the following
+contents into the file:
+
+<doc:example>
+ <doc:source>
+  Hello {{'World'}}!
+ </doc:source>
+</doc:example>
+
+
+# Step 2
+
+<img class="right" src="img/helloworld.png"/>
+Navigate to the file helloworld.html in your browser. The page should look like the screenshot
+below:
+
+
+That's it! Now take another look at helloworld.html. Here's what's going on behind the scenes:
+
+<pre>
+<html xmlns:ng="http://angularjs.org">
+</pre>
+
+Defines the namespace `ng`, which represents the URL `http://angularjs.org`. You must define the
+`ng` namespace in your application so the browser understands angular directives like
+`ng:autobind`.
+
+<pre>
+<script type="text/javascript" src="http://code.angularjs.org/angular-?.?.?.min.js" ng:autobind></script>
+</pre>
+
+Sets the `src` attribute of the script tag to `http://code.angularjs.org/angular-?.?.?.min.js` to
+bootstrap to the angular environment. Uses the `ng:autobind` attribute to compile and manage the
+whole HTML document. The compilation happens in the page's onLoad handler.
+
+<pre>
+Hello {{'World'}}!
+</pre>
+
+This is the template that describes how this element is displayed in the UI.
+Uses the double curly brace markup (`{{}}`) to bind an expression to the greeting text. In this
+case the expression is the string literal 'World'.
+
+# Step 3
+
+For a more advanced Hello World example that demonstrates angular's two-way data binding, edit
+helloworld.html and replace the contents of the `<body/>` with:
+
+<doc:example>
+ <doc:source>
+  Your name: <input type="text" name="yourname" value="World"/>
+  <hr/>
+  Hello {{yourname}}!
+ </doc:source>
+</doc:example>
+
+
+<img class="right" src="img/helloworld_2way.png"/>
+These are the changes to note:
+
+* The text input widget is bound to the text stored by the name variable.
+* The name variable is implicit in the root scope.
+* You did not need to explicitly register an event listener or define an event handler for events.
+
+Now refresh the `helloworld.html` page in your browser. Your screen should now look like this:
+
+
+Type your name into the input box and notice the immediate change to the displayed greeting. This
+example demonstrates the concept of angular's two-way data binding; any changes to the input field
+are immediately reflected in the greeting text.
+
+# Anatomy of an angular app
+These are the 3 parts of an angular app and how they map to the Model-View-Controller design pattern:
+
+# Template
+
+Templates, which you write in HTML and CSS, are the View. You add elements, attributes, and markup
+to HTML, which are instructions to the angular compiler. These instructions are fully extensible,
+meaning that you can build your own declarative language with angular.
+
+# Application Logic and Behavior
+
+Application Logic and Behavior, which you define in JavaScript, are the Controllers. Unlike
+normal AJAX applications, you don't need to write additional listeners or DOM manipulators in
+angular because they are built-in. This makes your application logic very easy to write, test,
+maintain, and understand.
+
+# Scope
+
+<img class="right" src="img/angular_parts.png"/>
+Scope, which is a JavaScript object that has the ability to watch for changes and get notified of
+them, is the Model. You typically don't need to write much, if any, additional JavaScript to
+define your model.
+
+Additionally, angular comes with a set of Services, which have the following properties:
+
+* Useful for building web applications.
+* You can extend the services and add application-specific behavior to them.
+* Examples include Dependency-Injection, XHR, caching, URL routing, and browser abstraction.
+
+The following illustrates each part of an angular application and how they work together:
+
+
+# Where to go next
+For more hands-on examples of using angular, including more source code that you can copy and
+paste into your own page, take a look through {@link cookbook}.
+For explanations of the concepts described in this example, see {@link guide.bootstrap bootstrap},
+{@link guide.template template}, {@link angular.widget.HTML input}, {@link angula.scope scope},
+{@link angular.markup markup}, and {@link guide.data-binding data binding}.
+
+To read about the HTML compiler and the compilation process, see {@link guide.compiler compiler}.
+For more angular concepts, see the {@link guide Developer Guide}.

docs/static/settings.html

@@ -0,0 +1,18 @@
+<label>Name:</label>
+<input type="text" name="form.name" ng:required>
+
+<div ng:repeat="contact in form.contacts">
+  <select name="contact.type">
+    <option>url</option>
+    <option>email</option>
+    <option>phone</option>
+  </select>
+  <input type="text" name="contact.url">
+  [ <a href="" ng:click="form.contacts.$remove(contact)">X</a> ]
+</div>
+<div>
+  [ <a href="" ng:click="form.contacts.$add()">add</a> ]
+</div>
+
+<button ng:click="cancel()">Cancel</button>
+<button ng:click="save()">Save</button>

docs/static/welcome.html

@@ -0,0 +1,5 @@
+Hello {{person.name}},
+<div>
+ Your contact information:
+ <div ng:repeat="contact in person.contacts">{{contact.type}}: {{contact.url|linky}}</div>
+</div>

docs/validator.template

@@ -1,59 +0,0 @@
-<h1>{{name}}</h1>
-
-{{#workInProgress}}
-<fieldset class="workInProgress">
-  <legend>Work In Progress</legend>
-  This page is currently being revised. It might be incomplete or contain inaccuracies.
-  {{{workInProgress.description}}}
-</fieldset>
-{{/workInProgress}}
-
-{{#deprecated}}
-<fieldset class="deprecated">
-  <legend>Deprecated API</legend>
-  {{deprecated}}
-</fieldset>
-{{/deprecated}}
-
-<h2>Description</h2>
-{{{description}}}
-
-<h2>Usage</h2>
-<h3>In HTML Template Binding</h3>
-<tt>
-  &lt;input type="text" ng:validate="{{shortName}}{{#paramRest}}{{^default}}:{{name}}{{/default}}{{#default}}<i>[:{{name}}]</i>{{/default}}{{/paramRest}}"/>
-</tt>
-
-<h3>In JavaScript</h3>
-<tt ng:non-bindable>
-angular.validator.{{shortName}}({{paramFirst.name}}{{#paramRest}}{{^default}}, {{name}}{{/default}}{{#default}}<i>[, {{name}}]</i>{{/default}}{{/paramRest}} );
-</tt>
-
-<h3>Parameters</h3>
-<ul>
-  {{#param}}
-  <li><tt>{{name}}</tt> –
-      <tt>&#123;{{#type}}{{type}}{{/type}}{{^type}}*{{/type}}{{#optional}}={{/optional}}&#125;</tt>
-      <tt>{{#default}}[{{default}}]{{/default}}</tt>
-      – {{{description}}}</li>
-  {{/param}}
-</ul>
-{{{paramDescription}}}
-
-{{#css}}
-<h3>CSS</h3>
-{{{css}}}
-{{/css}}
-
-{{#example}}
-<h2>Example</h2>
-{{{exampleDescription}}}
-<doc:example>
-  <doc:source>
-{{/example}}
-    {{{example}}}
-{{#example}}
-  </doc:source>
-  <doc:scenario>{{{scenario}}}</doc:scenario>
-</doc:example>
-{{/example}}

docs/widget.template

@@ -1,68 +0,0 @@
-<h1>{{name}}</h1>
-
-{{#workInProgress}}
-<fieldset class="workInProgress">
-  <legend>Work In Progress</legend>
-  This page is currently being revised. It might be incomplete or contain inaccuracies.
-  {{{workInProgress.description}}}
-</fieldset>
-{{/workInProgress}}
-
-{{#deprecated}}
-<fieldset class="deprecated">
-  <legend>Deprecated API</legend>
-  {{deprecated}}
-</fieldset>
-{{/deprecated}}
-
-<h2>Description</h2>
-{{{description}}}
-
-<h2>Usage</h2>
-<h3>In HTML Template Binding</h3>
-<tt>
-{{^element}}
-  <pre>
-&lt;{{shortName}}{{#param}} {{#default}}<i>[</i>{{/default}}{{name}}="..."{{#default}}<i>]</i>{{/default}}{{/param}}&gt;{{#usageContent}} 
-
-  {{usageContent}}
-{{/usageContent}}&lt;/{{shortName}}&gt;
-  </pre>
-{{/element}}
-{{#element}}
-  <pre>
-&lt;{{element}} {{shortName}}{{#paramFirst}}="{{paramFirst.name}}{{/paramFirst}}"&gt;
-  ...
-&lt;/{{element}}&gt;
-  </pre>
-{{/element}}
-</tt>
-
-<h3>Parameters</h3>
-<ul>
-  {{#param}}
-  <li><tt>{{name}}</tt> –
-      <tt>&#123;{{#type}}{{type}}{{/type}}{{^type}}*{{/type}}{{#optional}}={{/optional}}&#125;</tt>
-      <tt>{{#default}}[{{default}}]{{/default}}</tt>
-      – {{{description}}}</li>
-  {{/param}}
-</ul>
-{{{paramDescription}}}
-
-{{#css}}
-<h3>CSS</h3>
-{{{css}}}
-{{/css}}
-
-{{#example}}
-<h2>Example</h2>
-{{{exampleDescription}}}
-<doc:example>
-  <doc:source>
-{{/example}}
-    {{{example}}}
-{{#example}}
-  </doc:source>
-  <doc:scenario>{{{scenario}}}</doc:scenario>
-</doc:example>
-{{/example}}

example/personalLog/personalLog.html

@@ -9,7 +9,7 @@
 
   <!-- TODO: we need to expose $root so that we can delete cookies in the scenario runner, there
              must be a better way to do this -->
-  <body ng:controller="example.personalLog.LogCtrl" ng:init="$window.$root = $root">
+  <body ng:controller="example.personalLog.LogCtrl">
 
     <form action="" ng:submit="addLog(newMsg)">
       <input type="text" name="newMsg" />

example/personalLog/scenario/personalLogScenario.js

@@ -81,15 +81,14 @@ angular.scenario.dsl('clearCookies', function() {
    */
   return function() {
     this.addFutureAction('clear all cookies', function($window, $document, done) {
-      //TODO: accessing angular services is pretty nasty, we need a better way to reach them
-      var $cookies = $window.$root.$cookies,
+      var rootScope = $window.angular.element($document[0]).data('$scope'),
+          $cookies = rootScope.$service('$cookies'),
           cookieName;
 
       for (cookieName in $cookies) {
-        console.log('deleting cookie: ' + cookieName);
         delete $cookies[cookieName];
       }
-      $window.$root.$eval();
+      rootScope.$eval();
 
       done();
     });

example/personalLog/test/personalLogSpec.js

@@ -3,6 +3,7 @@ describe('example.personalLog.LogCtrl', function() {
 
   function createNotesCtrl() {
     var scope = angular.scope();
+    scope.$cookies = scope.$service('$cookies');
     return scope.$new(example.personalLog.LogCtrl);
   }
 

example/temp.html

@@ -1,36 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!doctype html>
 <html xmlns:ng="http://angularjs.org">
   <head>
-    <script type="text/javascript"
-         src="../angular-debug.js" ng:autobind ng:css="css/angular.css"></script>
+    <title>angular dev sandbox</title>
+    <script src="../src/angular-bootstrap.js" ng:autobind></script>
+    <script>
+    angular.service('routeConfig', function($route) {
+          $route.when('/view1', {controller: MyCtrl, template: 'view1.html'});
+          $route.when('/view2', {controller: MyCtrl, template: 'view2.html'});
+
+          function MyCtrl() {};
+        }, {$inject: ['$route'], $eager: true});
+    </script>
   </head>
-  <body ng:init="$window.$root = this">
-
-<script>
-angular.widget('my:greeter', function(compileElement){
-  var compiler = this;
-  compileElement.css('style', 'block');
-  var salutaitonExp = compileElement.attr('salutation');
-  var nameExp = compileElement.attr('name');
-  return function(linkElement){
-    var salutaitonSpan = angular.element('<span class="salutation"></span');
-    var nameSpan = angular.element('<span class="name"></span>');
-    linkElement.append(salutaitonSpan);
-    linkElement.append(compiler.text(' '));
-    linkElement.append(nameSpan);
-    linkElement.append(compiler.text('!'));
-    this.$watch(salutaitonExp, function(value){
-      salutaitonSpan.text(value);
-    });
-    this.$watch(nameExp, function(value){
-      nameSpan.text(value);
-    });
-  };
-});
-</script>
-<div ng:init="salutation='Hello'; name='World'">
-  <my:greeter salutation="salutation" name="name"/>
-</div>
+  <body ng:init="$service('$window').$root = this">
+    <p>
+      <a href="#/view1">view1</a> | <a href="#/view2">view2</a> | <a href="#">blank</a>
+    </p>
 
+    view: <ng:view></ng:view>
   </body>
-</html>
+</html>

gen_docs.sh

@@ -1,3 +1,3 @@
-#!/bin/sh
-
-node docs/specs.js --noColor && node docs/collect.js
+#!/bin/bash
+. ~/.bashrc
+node docs/spec/specs.js --noColor | grep -v '/lib/jasmine' && node docs/src/gen-docs.js

jsTestDriver-coverage.conf

@@ -13,7 +13,8 @@ load:
   - src/scenario/Scenario.js
   - src/scenario/output/*.js
   - src/scenario/*.js
-  - test/angular-mocks.js
+  - src/angular-mocks.js
+  - test/mocks.js
   - test/scenario/*.js
   - test/scenario/output/*.js
   - test/*.js

jsTestDriver-jquery.conf

@@ -8,14 +8,17 @@ load:
   - src/Angular.js
   - src/JSON.js
   - src/*.js
+  - example/personalLog/*.js
   - test/testabilityPatch.js
   - src/scenario/Scenario.js
   - src/scenario/output/*.js
   - src/scenario/*.js
-  - test/angular-mocks.js
+  - src/angular-mocks.js
+  - test/mocks.js
   - test/scenario/*.js
   - test/scenario/output/*.js
   - test/*.js
+  - example/personalLog/test/*.js
 
 exclude:
   - src/angular.prefix

jsTestDriver-perf.conf

@@ -0,0 +1,13 @@
+server: http://localhost:9876
+
+load:
+  - lib/jasmine-1.0.1/jasmine.js
+  - lib/jasmine-jstd-adapter/JasmineAdapter.js
+  - lib/jquery/jquery-1.4.2.js
+  - test/jquery_remove.js
+  - build/angular.min.js
+  - perf/data/*.js
+  - perf/testUtils.js
+  - perf/*.js
+
+exclude:

jsTestDriver.conf

@@ -13,7 +13,8 @@ load:
   - src/scenario/Scenario.js
   - src/scenario/output/*.js
   - src/scenario/*.js
-  - test/angular-mocks.js
+  - src/angular-mocks.js
+  - test/mocks.js
   - test/scenario/*.js
   - test/scenario/output/*.js
   - test/*.js

lib/jasmine-jstd-adapter/JasmineAdapter.js

@@ -1,111 +1,176 @@
 /**
  * @fileoverview Jasmine JsTestDriver Adapter.
- * @author ibolmo@gmail.com (Olmo Maldonado)
  * @author misko@hevery.com (Misko Hevery)
  */
+(function(window) {
+  var rootDescribes = new Describes(window);
+  var describePath = [];
+  rootDescribes.collectMode();
+  
+  var jasmineTest = TestCase('Jasmine Adapter Tests');
+  
+  var jasminePlugin = {
+      name:'jasmine',
+      runTestConfiguration: function(testRunConfiguration, onTestDone, onTestRunConfigurationComplete){
+        if (testRunConfiguration.testCaseInfo_.template_ !== jasmineTest) return;
+        
+        var jasmineEnv = jasmine.currentEnv_ = new jasmine.Env();
+        rootDescribes.playback();
+        var specLog = jstestdriver.console.log_ = [];
+        var start;
+        jasmineEnv.specFilter = function(spec) {
+          return rootDescribes.isExclusive(spec);
+        };
+        jasmineEnv.reporter = {
+          log: function(str){
+            specLog.push(str);
+          },
 
-(function() {
+          reportRunnerStarting: function(runner) { },
 
-  function bind(_this, _function){
-    return function(){
-      return _function.call(_this);
-    };
+          reportSpecStarting: function(spec) {
+            specLog = jstestdriver.console.log_ = [];
+            start = new Date().getTime();
+          },
+
+          reportSpecResults: function(spec) {
+            var suite = spec.suite;
+            var results = spec.results();
+            if (results.skipped) return;
+            var end = new Date().getTime();
+            var messages = [];
+            var resultItems = results.getItems();
+            var state = 'passed';
+            for ( var i = 0; i < resultItems.length; i++) {
+              if (!resultItems[i].passed()) {
+                state = resultItems[i].message.match(/AssertionError:/) ? 'error' : 'failed';
+                messages.push(resultItems[i].toString());
+                messages.push(formatStack(resultItems[i].trace.stack));
+              }
+            }
+            onTestDone(
+              new jstestdriver.TestResult(
+                suite.getFullName(), 
+                spec.description, 
+                state, 
+                messages.join('\n'), 
+                specLog.join('\n'),
+                end - start));
+          },
+
+          reportSuiteResults: function(suite) {},
+          
+          reportRunnerResults: function(runner) {
+            onTestRunConfigurationComplete();
+          }
+        };
+        jasmineEnv.execute();
+        return true;
+      },
+      onTestsFinish: function(){
+        jasmine.currentEnv_ = null;
+        rootDescribes.collectMode();
+      }
+  };
+  jstestdriver.pluginRegistrar.register(jasminePlugin);
+
+  function formatStack(stack) {
+    var lines = (stack||'').split(/\r?\n/);
+    var frames = [];
+    for (i = 0; i < lines.length; i++) {
+      if (!lines[i].match(/\/jasmine[\.-]/)) {
+        frames.push(lines[i].replace(/https?:\/\/\w+(:\d+)?\/test\//, '').replace(/^\s*/, '      '));
+      }
+    }
+    return frames.join('\n');
   }
 
-  var currentFrame = frame(null, null);
-
-  function frame(parent, name){
-    var caseName = (parent && parent.caseName ? parent.caseName + " " : '') + (name ? name : '');
-    var frame = {
-      name: name,
-      caseName: caseName,
-      parent: parent,
-      testCase: TestCase(caseName),
-      before: [],
-      after: [],
-      runBefore: function(){
-        if (parent) parent.runBefore.apply(this);
-        for ( var i = 0; i < frame.before.length; i++) {
-          frame.before[i].apply(this);
-        }
-      },
-      runAfter: function(){
-        for ( var i = 0; i < frame.after.length; i++) {
-          frame.after[i].apply(this);
-        }
-        if (parent) parent.runAfter.apply(this);
-      }
-    };
-    return frame;
-  };
-
-  jasmine.Env.prototype.describe = (function(describe){
-    return function(description){
-      currentFrame = frame(currentFrame, description);
-      var val = describe.apply(this, arguments);
-      currentFrame = currentFrame.parent;
-      return val;
-    };
-
-  })(jasmine.Env.prototype.describe);
-
-  var id = 0;
-
-  jasmine.Env.prototype.it = (function(it){
-    return function(desc, itFn){
-      var self = this;
-      var spec = it.apply(this, arguments);
-      var currentSpec = this.currentSpec;
-      if (!currentSpec.$id) {
-        currentSpec.$id = id++;
-      }
-      var frame = this.jstdFrame = currentFrame;
-      var name = 'test that it ' + desc;
-      if (this.jstdFrame.testCase.prototype[name])
-        throw "Spec with name '" + desc + "' already exists.";
-      this.jstdFrame.testCase.prototype[name] = function(){
-        jasmine.getEnv().currentSpec = currentSpec;
-        frame.runBefore.apply(currentSpec);
-        try {
-          itFn.apply(currentSpec);
-        } finally {
-          frame.runAfter.apply(currentSpec);
+  function noop(){}
+  function Describes(window){
+    var describes = {};
+    var beforeEachs = {};
+    var afterEachs = {};
+    var exclusive;
+    var collectMode = true;
+    intercept('describe', describes);
+    intercept('xdescribe', describes);
+    intercept('beforeEach', beforeEachs);
+    intercept('afterEach', afterEachs);
+    
+    function intercept(functionName, collection){
+      window[functionName] = function(desc, fn){
+        if (collectMode) {
+          collection[desc] = function(){
+            jasmine.getEnv()[functionName](desc, fn);
+          };
+        } else {
+          jasmine.getEnv()[functionName](desc, fn);
         }
       };
-      return spec;
+    }
+    window.ddescribe = function(name, fn){
+      exclusive = true;
+      console.log('ddescribe', name);
+      window.describe(name, function(){
+        var oldIt = window.it;
+        window.it = window.iit;
+        try {
+          fn.call(this);
+        } finally {
+          window.it = oldIt;
+        };
+      });
     };
-
-  })(jasmine.Env.prototype.it);
-
-
-  jasmine.Env.prototype.beforeEach = (function(beforeEach){
-    return function(beforeEachFunction) {
-      beforeEach.apply(this, arguments);
-      currentFrame.before.push(beforeEachFunction);
+    window.iit = function(name, fn){
+      exclusive = fn.exclusive = true;
+      console.log(fn);
+      jasmine.getEnv().it(name, fn);
     };
-
-  })(jasmine.Env.prototype.beforeEach);
-
-
-  jasmine.Env.prototype.afterEach = (function(afterEach){
-    return function(afterEachFunction) {
-      afterEach.apply(this, arguments);
-      currentFrame.after.push(afterEachFunction);
+    
+    
+    this.collectMode = function() {
+      collectMode = true;
+      exclusive = false;
     };
-
-  })(jasmine.Env.prototype.afterEach);
-
-
-  jasmine.NestedResults.prototype.addResult = (function(addResult){
-    return function(result) {
-      addResult.call(this, result);
-      if (result.type != 'MessageResult' && !result.passed()) fail(result.message);
+    this.playback = function(){
+      collectMode = false;
+      playback(beforeEachs);
+      playback(afterEachs);
+      playback(describes);
+      
+      function playback(set) {
+        for ( var name in set) {
+          set[name]();
+        }
+      }
     };
+    
+    this.isExclusive = function(spec) {
+      if (exclusive) {
+        var blocks = spec.queue.blocks;
+        for ( var i = 0; i < blocks.length; i++) {
+          if (blocks[i].func.exclusive) {
+            return true;
+          }
+        }
+        return false;
+      }
+      return true;
+    };
+  }
+  
+})(window);
 
-  })(jasmine.NestedResults.prototype.addResult);
+// Patch Jasmine for proper stack traces
+jasmine.Spec.prototype.fail = function (e) {
+  var expectationResult = new jasmine.ExpectationResult({
+    passed: false,
+    message: e ? jasmine.util.formatException(e) : 'Exception'
+  });
+  // PATCH
+  if (e) {
+    expectationResult.trace = e;
+  }
+  this.results_.addResult(expectationResult);
+};
 
-  // Reset environment with overriden methods.
-  jasmine.currentEnv_ = null;
-  jasmine.getEnv();
-
-})();

lib/mustache/LICENSE

@@ -1,21 +0,0 @@
-Copyright (c) 2009 Chris Wanstrath (Ruby)
-Copyright (c) 2010 Jan Lehnardt (JavaScript)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/mustache/index.js

@@ -1,344 +0,0 @@
-/*
- * CommonJS-compatible mustache.js module
- *
- * See http://github.com/janl/mustache.js for more info.
- */
-/*
-  mustache.js Ñ Logic-less templates in JavaScript
-
-  See http://mustache.github.com/ for more info.
-*/
-
-var Mustache = function() {
-  var Renderer = function() {};
-
-  Renderer.prototype = {
-    otag: "{{",
-    ctag: "}}",
-    pragmas: {},
-    buffer: [],
-    pragmas_implemented: {
-      "IMPLICIT-ITERATOR": true
-    },
-    context: {},
-
-    render: function(template, context, partials, in_recursion) {
-      // reset buffer & set context
-      if(!in_recursion) {
-        this.context = context;
-        this.buffer = []; // TODO: make this non-lazy
-      }
-
-      // fail fast
-      if(!this.includes("", template)) {
-        if(in_recursion) {
-          return template;
-        } else {
-          this.send(template);
-          return;
-        }
-      }
-
-      template = this.render_pragmas(template);
-      var html = this.render_section(template, context, partials);
-      if(in_recursion) {
-        return this.render_tags(html, context, partials, in_recursion);
-      }
-
-      this.render_tags(html, context, partials, in_recursion);
-    },
-
-    /*
-      Sends parsed lines
-    */
-    send: function(line) {
-      if(line != "") {
-        this.buffer.push(line);
-      }
-    },
-
-    /*
-      Looks for %PRAGMAS
-    */
-    render_pragmas: function(template) {
-      // no pragmas
-      if(!this.includes("%", template)) {
-        return template;
-      }
-
-      var that = this;
-      var regex = new RegExp(this.otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" +
-            this.ctag);
-      return template.replace(regex, function(match, pragma, options) {
-        if(!that.pragmas_implemented[pragma]) {
-          throw({message:
-            "This implementation of mustache doesn't understand the '" +
-            pragma + "' pragma"});
-        }
-        that.pragmas[pragma] = {};
-        if(options) {
-          var opts = options.split("=");
-          that.pragmas[pragma][opts[0]] = opts[1];
-        }
-        return "";
-        // ignore unknown pragmas silently
-      });
-    },
-
-    /*
-      Tries to find a partial in the curent scope and render it
-    */
-    render_partial: function(name, context, partials) {
-      name = this.trim(name);
-      if(!partials || partials[name] === undefined) {
-        throw({message: "unknown_partial '" + name + "'"});
-      }
-      if(typeof(context[name]) != "object") {
-        return this.render(partials[name], context, partials, true);
-      }
-      return this.render(partials[name], context[name], partials, true);
-    },
-
-    /*
-      Renders inverted (^) and normal (#) sections
-    */
-    render_section: function(template, context, partials) {
-      if(!this.includes("#", template) && !this.includes("^", template)) {
-        return template;
-      }
-
-      var that = this;
-      // CSW - Added "+?" so it finds the tighest bound, not the widest
-      var regex = new RegExp(this.otag + "(\\^|\\#)\\s*(.+)\\s*" + this.ctag +
-              "\n*([\\s\\S]+?)" + this.otag + "\\/\\s*\\2\\s*" + this.ctag +
-              "\\s*", "mg");
-
-      // for each {{#foo}}{{/foo}} section do...
-      return template.replace(regex, function(match, type, name, content) {
-        var value = that.find(name, context);
-        if(type == "^") { // inverted section
-          if(!value || that.is_array(value) && value.length === 0) {
-            // false or empty list, render it
-            return that.render(content, context, partials, true);
-          } else {
-            return "";
-          }
-        } else if(type == "#") { // normal section
-          if(that.is_array(value)) { // Enumerable, Let's loop!
-            return that.map(value, function(row) {
-              return that.render(content, that.create_context(row),
-                partials, true);
-            }).join("");
-          } else if(that.is_object(value)) { // Object, Use it as subcontext!
-            return that.render(content, that.create_context(value),
-              partials, true);
-          } else if(typeof value === "function") {
-            // higher order section
-            return value.call(context, content, function(text) {
-              return that.render(text, context, partials, true);
-            });
-          } else if(value) { // boolean section
-            return that.render(content, context, partials, true);
-          } else {
-            return "";
-          }
-        }
-      });
-    },
-
-    /*
-      Replace {{foo}} and friends with values from our view
-    */
-    render_tags: function(template, context, partials, in_recursion) {
-      // tit for tat
-      var that = this;
-
-      var new_regex = function() {
-        return new RegExp(that.otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" +
-          that.ctag + "+", "g");
-      };
-
-      var regex = new_regex();
-      var tag_replace_callback = function(match, operator, name) {
-        switch(operator) {
-        case "!": // ignore comments
-          return "";
-        case "=": // set new delimiters, rebuild the replace regexp
-          that.set_delimiters(name);
-          regex = new_regex();
-          return "";
-        case ">": // render partial
-          return that.render_partial(name, context, partials);
-        case "{": // the triple mustache is unescaped
-          return that.find(name, context);
-        default: // escape the value
-          return that.escape(that.find(name, context));
-        }
-      };
-      var lines = template.split("\n");
-      for(var i = 0; i < lines.length; i++) {
-        lines[i] = lines[i].replace(regex, tag_replace_callback, this);
-        if(!in_recursion) {
-          this.send(lines[i]);
-        }
-      }
-
-      if(in_recursion) {
-        return lines.join("\n");
-      }
-    },
-
-    set_delimiters: function(delimiters) {
-      var dels = delimiters.split(" ");
-      this.otag = this.escape_regex(dels[0]);
-      this.ctag = this.escape_regex(dels[1]);
-    },
-
-    escape_regex: function(text) {
-      // thank you Simon Willison
-      if(!arguments.callee.sRE) {
-        var specials = [
-          '/', '.', '*', '+', '?', '|',
-          '(', ')', '[', ']', '{', '}', '\\'
-        ];
-        arguments.callee.sRE = new RegExp(
-          '(\\' + specials.join('|\\') + ')', 'g'
-        );
-      }
-      return text.replace(arguments.callee.sRE, '\\$1');
-    },
-
-    /*
-      find `name` in current `context`. That is find me a value
-      from the view object
-    */
-    find: function(name, context) {
-      name = this.trim(name);
-
-      // Checks whether a value is thruthy or false or 0
-      function is_kinda_truthy(bool) {
-        return bool === false || bool === 0 || bool;
-      }
-
-      var value = context;
-      var path = name.split(/\./);
-      for(var i = 0; i < path.length; i++) {
-        name = path[i];
-        if(value && is_kinda_truthy(value[name])) {
-          value = value[name];
-        } else if(i == 0 && is_kinda_truthy(this.context[name])) {
-          value = this.context[name];
-        } else {
-          value = undefined;
-        }
-      }
-
-      if(typeof value === "function") {
-        return value.apply(context);
-      }
-      if(value !== undefined) {
-        return value;
-      }
-      // silently ignore unkown variables
-      return "";
-    },
-
-    // Utility methods
-
-    /* includes tag */
-    includes: function(needle, haystack) {
-      return haystack.indexOf(this.otag + needle) != -1;
-    },
-
-    /*
-      Does away with nasty characters
-    */
-    escape: function(s) {
-      s = String(s === null ? "" : s);
-      return s.replace(/&(?!\w+;)|["'<>\\]/g, function(s) {
-        switch(s) {
-        case "&": return "&amp;";
-        case "\\": return "\\\\";
-        case '"': return '&quot;';
-        case "'": return '&#39;';
-        case "<": return "&lt;";
-        case ">": return "&gt;";
-        default: return s;
-        }
-      });
-    },
-
-    // by @langalex, support for arrays of strings
-    create_context: function(_context) {
-      if(this.is_object(_context)) {
-        return _context;
-      } else {
-        var iterator = ".";
-        if(this.pragmas["IMPLICIT-ITERATOR"]) {
-          iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator;
-        }
-        var ctx = {};
-        ctx[iterator] = _context;
-        return ctx;
-      }
-    },
-
-    is_object: function(a) {
-      return a && typeof a == "object";
-    },
-
-    is_array: function(a) {
-      return Object.prototype.toString.call(a) === '[object Array]';
-    },
-
-    /*
-      Gets rid of leading and trailing whitespace
-    */
-    trim: function(s) {
-      return s.replace(/^\s*|\s*$/g, "");
-    },
-
-    /*
-      Why, why, why? Because IE. Cry, cry cry.
-    */
-    map: function(array, fn) {
-      if (typeof array.map == "function") {
-        return array.map(fn);
-      } else {
-        var r = [];
-        var l = array.length;
-        for(var i = 0; i < l; i++) {
-          r.push(fn(array[i]));
-        }
-        return r;
-      }
-    }
-  };
-
-  return({
-    name: "mustache.js",
-    version: "0.3.1-dev",
-
-    /*
-      Turns a template and view into HTML
-    */
-    to_html: function(template, view, partials, send_fun) {
-      var renderer = new Renderer();
-      if(send_fun) {
-        renderer.send = send_fun;
-      }
-      renderer.render(template, view, partials);
-      if(!send_fun) {
-        return renderer.buffer.join("\n");
-      }
-    }
-  });
-}();
-
-
-exports.name = Mustache.name;
-exports.version = Mustache.version;
-
-exports.to_html = function() {
-  return Mustache.to_html.apply(this, arguments);
-};

perf/DCLvsWindowOnLoad.html

@@ -0,0 +1,37 @@
+<!doctype html>
+<!--
+
+This test demonstrates the time difference between document's DOMContentLoaded and window's load events.
+
+-->
+<html>
+  <head>
+    <script>
+      startTS = new Date().getTime();
+      onDOMContentLoadedTS = 0; // default for browsers where DOMCL is not supported
+    </script>
+    <title>DOMContentLoaded test</title>
+    <script src="../build/angular.min.js" ng:autobind></script>
+    <script>
+      angular.element(document).bind('DOMContentLoaded', function(e) {onDOMContentLoadedTS = new Date().getTime()});
+      angular.element(window).bind('load', function(e) {
+          onloadTS = new Date().getTime();
+          log.innerHTML = 'start: ' + new Date(startTS) + '<br/>DOMContentLoaded: +' + (onDOMContentLoadedTS - startTS) +  'ms<br/> load: +' + (onloadTS - startTS) + 'ms';
+        });
+    </script>
+  </head>
+  <body>
+    <h1>DOMContentLoaded test</h1>
+    <p>{{ 'yay!' || 'angular starting...' }}</p>
+
+    <img width="100px" src="http://lh5.ggpht.com/_BLyMhylclm0/TST_bbGH0zI/AAAAAAAAATY/oNUn9kivKN8/s912/1020047.jpg" />
+    <img width="100px" src="http://lh5.ggpht.com/_MqEybfAuUFk/TSOOiegUlPI/AAAAAAAADHY/AEwEWc64_-M/s800/IMG_7294.JPG" />
+    <img width="100px" src="http://lh3.ggpht.com/_LdjD3ua8rpE/TSOW99rwjZI/AAAAAAAAFC0/0qJRhhN45RM/s912/Saison%2010%20%2834%29.JPG" />
+    <img width="100px" src="http://lh6.ggpht.com/_oy_-am3CVUw/TSOQBddZpwI/AAAAAAAACaw/ogFgoD79bVE/s912/P1100886.JPG" />
+    <img width="100px" src="http://lh4.ggpht.com/_srSaA7ZN7oc/TDdxXbA_i1I/AAAAAAAAQ2w/ii3vgrnfCrM/s800/Urlaub10%20157.jpg" />
+    <img width="100px" src="http://lh5.ggpht.com/_y6vXu6iRrfM/SIaYhRQBYNI/AAAAAAAAAmE/lV2NYwxtsQM/s912/North%20Dakota%20Trip%20014.JPG" />
+    <img width="100px" src="http://lh5.ggpht.com/_Jjv9cIn9cS8/RuwZCgfOl6I/AAAAAAAAAOc/QrrMe8vpawg/s800/Shark%20Trip%20-%20day%202%20513.JPG" />
+
+    <p id="log"></p>
+  </body>
+</html>

perf/data/jsonParserPayload.rb

@@ -0,0 +1,49 @@
+def generate_object(f, objName, iterations)
+  f.write("var #{objName}='[");
+ 
+  iterations.times do |i| 
+    f.write('{')
+
+    f.write('"simpleStringProperty":')     #23
+    f.write('"some string value ' + ('%07d' % i) + '"')  #27
+    f.write(',')
+    
+    f.write('"stringWithQuotes":')         #19
+    f.write('"some string with \\\\"quotes\\\\" ' + ('%07d' % i) + '"')  #36
+    f.write(',')
+ 
+    f.write('"stringWithUnicode":')
+    f.write('"short string with \\u1234 unicode \\u2345 chars ' +  ('%07d' % i) + '"')
+    f.write(',')
+
+    f.write('"aNumber":')  #10
+    f.write(i)  #?
+    f.write(',')
+   
+    f.write('"smallArray":')
+    f.write('["a",23,"b",42,' + i.to_s + ']')
+    f.write(',')
+
+    f.write('"smallObj":')
+    f.write('{"foo":"bar","baz":543,"num":' + i.to_s + ',"fuz":"fuz buz huz duz ' + i.to_s + '"}')
+    f.write(',')
+
+    f.write('"timeStamp":')
+    f.write('"2010-12-22T04:58:01.' + ("%03d" % (i%1000)) + '"')
+
+    f.write('},')
+  end
+
+  f.write('"just a padding string"]\';' + "\n\n");
+end
+
+file_path = File.join(File.dirname(__FILE__), 'jsonParserPayload.js')
+
+File.open(file_path, 'w') do |f|
+  generate_object(f, 'superTinyJsonString', 1)  #~300b
+  generate_object(f, 'tinyJsonString', 3)       #~1kb
+  generate_object(f, 'smallJsonString', 30)     #~10kb
+  generate_object(f, 'mediumJsonString', 600)   #~200kb
+  generate_object(f, 'largeJsonString', 2000)   #~650kb
+end
+

perf/jsonPerfSpec.js

@@ -0,0 +1,28 @@
+describe('json', function() {
+
+  it('angular parser', function() {
+    var duration = time(function() {
+      expect(angular.fromJson(largeJsonString)).toBeTruthy();
+    }, 1);
+
+    dump(duration/1 + ' ms per iteration');
+  });
+
+
+  it('angular delegating to native parser', function() {
+    var duration = time(function() {
+      expect(angular.fromJson(largeJsonString, true)).toBeTruthy();
+    }, 100);
+
+    dump(duration/100 + ' ms per iteration');
+  });
+
+
+  it('native json', function() {
+    var duration = time(function() {
+      expect(JSON.parse(largeJsonString)).toBeTruthy();
+    }, 100);
+
+    dump(duration/100 + ' ms per iteration');
+  });
+});

perf/noangular.html

@@ -0,0 +1,19 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xmlns:ng="http://angularjs.org">
+  <head>
+    <script>
+      function el(id) {
+        return document.getElementById(id);
+      }
+      function update() {
+        el("output").innerHTML = el("input").value;
+      }
+    </script>
+  </head>
+  <body>
+    Your name: <input id="input" type="text" value="World"
+    onkeydown="setTimeout(update,0)"/>
+    <hr/>
+    Hello <span id="output">{{yourname}}</span>!
+  </body>
+</html>