From d85505d0194e6aa2cfe24aea51afe12a09ba73d2 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Fri, 14 Feb 2014 14:12:13 +0000 Subject: docs(content): fix bad links --- docs/content/guide/concepts.ngdoc | 2 +- docs/content/guide/controller.ngdoc | 2 +- docs/content/guide/dev_guide.e2e-testing.ngdoc | 2 +- docs/content/guide/dev_guide.services.$location.ngdoc | 7 +++---- docs/content/guide/expression.ngdoc | 2 +- docs/content/guide/forms.ngdoc | 16 ++++++++-------- docs/content/guide/templates.ngdoc | 4 ++-- docs/content/misc/faq.ngdoc | 2 +- src/ng/directive/form.js | 2 +- src/ng/directive/input.js | 16 ++++++++-------- src/ng/exceptionHandler.js | 2 +- src/ng/http.js | 3 +-- src/ng/httpBackend.js | 1 - src/ng/location.js | 2 -- src/ng/timeout.js | 1 - src/ngCookies/cookies.js | 1 - 16 files changed, 29 insertions(+), 36 deletions(-) diff --git a/docs/content/guide/concepts.ngdoc b/docs/content/guide/concepts.ngdoc index 105af400..5b4c8217 100644 --- a/docs/content/guide/concepts.ngdoc +++ b/docs/content/guide/concepts.ngdoc @@ -86,7 +86,7 @@ in the rest of the documentation. Applied to the example above, the markup directs Angular to "take the data we got from the input widgets and multiply them together". -The example above also contains a "{@link filter filter}". +The example above also contains a "{@link guide/filter filter}". A filter formats the value of an expression for display to the user. In the example above, the filter {@link ng.filter:currency `currency`} formats a number into an output that looks like money. diff --git a/docs/content/guide/controller.ngdoc b/docs/content/guide/controller.ngdoc index cdcd3752..6a75f090 100644 --- a/docs/content/guide/controller.ngdoc +++ b/docs/content/guide/controller.ngdoc @@ -109,7 +109,7 @@ logic. Angular offers {@link databinding databinding} for automatic DOM manipula you have to perform your own manual DOM manipulation, encapsulate the presentation logic in {@link guide/directive directives}. - Input formatting — Use {@link forms angular form controls} instead. -- Output filtering — Use {@link filter angular filters} instead. +- Output filtering — Use {@link guide/filter angular filters} instead. - Sharing stateless or stateful code across Controllers — Use {@link dev_guide.services angular services} instead. - Managing the life-cycle of other components (for example, to create service instances). diff --git a/docs/content/guide/dev_guide.e2e-testing.ngdoc b/docs/content/guide/dev_guide.e2e-testing.ngdoc index da2dc48a..74280db3 100644 --- a/docs/content/guide/dev_guide.e2e-testing.ngdoc +++ b/docs/content/guide/dev_guide.e2e-testing.ngdoc @@ -4,7 +4,7 @@ @description **Angular Scenario Runner is in maintenance mode - If you're starting a new Angular project, -consider using {@link https://github.com/angular/protractor Protractor}.** +consider using [Protractor](https://github.com/angular/protractor).** diff --git a/docs/content/guide/dev_guide.services.$location.ngdoc b/docs/content/guide/dev_guide.services.$location.ngdoc index 57739f9f..87d90ebd 100644 --- a/docs/content/guide/dev_guide.services.$location.ngdoc +++ b/docs/content/guide/dev_guide.services.$location.ngdoc @@ -635,10 +635,9 @@ then uses the information it obtains to compose hashbang URLs (such as ## Two-way binding to $location The Angular's compiler currently does not support two-way binding for methods (see [issue](https://github.com/angular/angular.js/issues/404)). If you should require two-way binding -to the $location object (using {@link ng.directive:input.text -ngModel} directive on an input field), you will need to specify an extra model property -(e.g. `locationPath`) with two watchers which push $location updates in both directions. For -example: +to the $location object (using {@link input[text] ngModel} directive on an input +field), you will need to specify an extra model property (e.g. `locationPath`) with two watchers +which push $location updates in both directions. For example:
diff --git a/docs/content/guide/expression.ngdoc b/docs/content/guide/expression.ngdoc index 583fa5fd..eda2f4b7 100644 --- a/docs/content/guide/expression.ngdoc +++ b/docs/content/guide/expression.ngdoc @@ -4,7 +4,7 @@ Expressions are JavaScript-like code snippets that are usually placed in bindings such as `{{ expression }}`. Expressions are processed by the {@link ng.$parse $parse} -service. Expressions are often post processed using {@link filter filters} to create a more user-friendly format. +service. Expressions are often post processed using {@link guide/filter filters} to create a more user-friendly format. For example, these are all valid expressions in angular: diff --git a/docs/content/guide/forms.ngdoc b/docs/content/guide/forms.ngdoc index d5f59d18..2ef5e218 100644 --- a/docs/content/guide/forms.ngdoc +++ b/docs/content/guide/forms.ngdoc @@ -14,7 +14,7 @@ Server-side validation is still necessary for a secure application. # Simple form The key directive in understanding two-way data-binding is {@link ng.directive:ngModel ngModel}. The `ngModel` directive provides the two-way data-binding by synchronizing the model to the view, as well as view to the model. -In addition it provides an {@link ng.directive:ngModel.NgModelController API} for other directives to augment its behavior. +In addition it provides an {@link ngModel.NgModelController API} for other directives to augment its behavior. @@ -113,11 +113,11 @@ This ensures that the user is not distracted with an error until after interacti # Binding to form and control state -A form is an instance of {@link ng.directive:form.FormController FormController}. +A form is an instance of {@link form.FormController FormController}. The form instance can optionally be published into the scope using the `name` attribute. Similarly, an input control that has the {@link ng.directive:ngModel ngModel} directive holds an -instance of {@link ng.directive:ngModel.NgModelController NgModelController}. +instance of {@link ngModel.NgModelController NgModelController}. Such a control instance can be published as a property of the form instance using the `name` attribute on the input control. The name attribute specifies the name of the property on the form instance. @@ -184,18 +184,18 @@ This allows us to extend the above example with these features: # Custom Validation Angular provides basic implementation for most common html5 {@link ng.directive:input input} -types: ({@link ng.directive:input.text text}, {@link ng.directive:input.number number}, {@link ng.directive:input.url url}, {@link ng.directive:input.email email}, {@link ng.directive:input.radio radio}, {@link ng.directive:input.checkbox checkbox}), as well as some directives for validation (`required`, `pattern`, `minlength`, `maxlength`, `min`, `max`). +types: ({@link input[text] text}, {@link input[number] number}, {@link input[url] url}, {@link input[email] email}, {@link input[radio] radio}, {@link input[checkbox] checkbox}), as well as some directives for validation (`required`, `pattern`, `minlength`, `maxlength`, `min`, `max`). -Defining your own validator can be done by defining your own directive which adds a custom validation function to the `ngModel` {@link ng.directive:ngModel.NgModelController controller}. +Defining your own validator can be done by defining your own directive which adds a custom validation function to the `ngModel` {@link ngModel.NgModelController controller}. To get a hold of the controller the directive specifies a dependency as shown in the example below. The validation can occur in two places: * **Model to View update** - - Whenever the bound model changes, all functions in {@link ng.directive:ngModel.NgModelController#properties_$formatters NgModelController#$formatters} array are pipe-lined, so that each of these functions has an opportunity to format the value and change validity state of the form control through {@link ng.directive:ngModel.NgModelController#methods_$setValidity NgModelController#$setValidity}. + Whenever the bound model changes, all functions in {@link ngModel.NgModelController#properties_$formatters NgModelController#$formatters} array are pipe-lined, so that each of these functions has an opportunity to format the value and change validity state of the form control through {@link ngModel.NgModelController#methods_$setValidity NgModelController#$setValidity}. * **View to Model update** - - In a similar way, whenever a user interacts with a control it calls {@link ng.directive:ngModel.NgModelController#methods_$setViewValue NgModelController#$setViewValue}. -This in turn pipelines all functions in the {@link ng.directive:ngModel.NgModelController#properties_$parsers NgModelController#$parsers} array, so that each of these functions has an opportunity to convert the value and change validity state of the form control through {@link ng.directive:ngModel.NgModelController#methods_$setValidity NgModelController#$setValidity}. + In a similar way, whenever a user interacts with a control it calls {@link ngModel.NgModelController#methods_$setViewValue NgModelController#$setViewValue}. +This in turn pipelines all functions in the {@link ngModel.NgModelController#properties_$parsers NgModelController#$parsers} array, so that each of these functions has an opportunity to convert the value and change validity state of the form control through {@link ngModel.NgModelController#methods_$setValidity NgModelController#$setValidity}. In the following example we create two directives. diff --git a/docs/content/guide/templates.ngdoc b/docs/content/guide/templates.ngdoc index bd8bfd89..92aee6ee 100644 --- a/docs/content/guide/templates.ngdoc +++ b/docs/content/guide/templates.ngdoc @@ -14,7 +14,7 @@ These are the types of Angular elements and element attributes you can use in a augments an existing DOM element or represents a reusable DOM component - a widget. * {@link ng.$interpolate Markup} — The double curly brace notation `{{ }}` to bind expressions to elements is built-in angular markup. -* {@link filter Filter} — Formats your data for display to the user. +* {@link guide/filter Filter} — Formats your data for display to the user. * {@link forms Form controls} — Lets you validate user input. Note: In addition to declaring the elements above in templates, you can also access these elements @@ -49,7 +49,7 @@ eight. ## Related Topics -* {@link filter Angular Filters} +* {@link guide/filter Angular Filters} * {@link forms Angular Forms} ## Related API diff --git a/docs/content/misc/faq.ngdoc b/docs/content/misc/faq.ngdoc index e416055e..157f2eac 100644 --- a/docs/content/misc/faq.ngdoc +++ b/docs/content/misc/faq.ngdoc @@ -100,7 +100,7 @@ Watch the July 17, 2012 talk ### How is Angular licensed? -The {@link https://github.com/angular/angular.js/blob/master/LICENSE MIT License}. +The [MIT License](https://github.com/angular/angular.js/blob/master/LICENSE). ### Can I download and use the Angular logo artwork? diff --git a/src/ng/directive/form.js b/src/ng/directive/form.js index b6919836..b55eec6d 100644 --- a/src/ng/directive/form.js +++ b/src/ng/directive/form.js @@ -226,7 +226,7 @@ function FormController(element, attrs) { * * @description * Directive that instantiates - * {@link ng.directive:form.FormController FormController}. + * {@link form.FormController FormController}. * * If the `name` attribute is specified, the form controller is published onto the current scope under * this name. diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js index c7983d16..a617af6d 100644 --- a/src/ng/directive/input.js +++ b/src/ng/directive/input.js @@ -854,7 +854,7 @@ var VALID_CLASS = 'ng-valid', the control reads value from the DOM. Each function is called, in turn, passing the value through to the next. Used to sanitize / convert the value as well as validation. For validation, the parsers should update the validity state using - {@link ng.directive:ngModel.NgModelController#methods_$setValidity $setValidity()}, + {@link ngModel.NgModelController#$setValidity $setValidity()}, and return `undefined` for invalid values. * @@ -1191,7 +1191,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ * * @description * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a - * property on the scope using {@link ng.directive:ngModel.NgModelController NgModelController}, + * property on the scope using {@link ngModel.NgModelController NgModelController}, * which is created and exposed by this directive. * * `ngModel` is responsible for: @@ -1214,12 +1214,12 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ * For basic examples, how to use `ngModel`, see: * * - {@link ng.directive:input input} - * - {@link ng.directive:input.text text} - * - {@link ng.directive:input.checkbox checkbox} - * - {@link ng.directive:input.radio radio} - * - {@link ng.directive:input.number number} - * - {@link ng.directive:input.email email} - * - {@link ng.directive:input.url url} + * - {@link input[text] text} + * - {@link input[checkbox] checkbox} + * - {@link input[radio] radio} + * - {@link input[number] number} + * - {@link input[email] email} + * - {@link input[url] url} * - {@link ng.directive:select select} * - {@link ng.directive:textarea textarea} * diff --git a/src/ng/exceptionHandler.js b/src/ng/exceptionHandler.js index c2c77f64..342f38fc 100644 --- a/src/ng/exceptionHandler.js +++ b/src/ng/exceptionHandler.js @@ -3,7 +3,7 @@ /** * @ngdoc service * @name $exceptionHandler - * @requires $log + * @requires ng.$log * * @description * Any uncaught exception in angular expressions is delegated to this service. diff --git a/src/ng/http.js b/src/ng/http.js index 81112bde..7d9a82be 100644 --- a/src/ng/http.js +++ b/src/ng/http.js @@ -174,8 +174,7 @@ function $HttpProvider() { * @ngdoc service * @kind function * @name $http - * @requires $httpBackend - * @requires $browser + * @requires ng.$httpBackend * @requires $cacheFactory * @requires $rootScope * @requires $q diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js index 415cd19f..c3805e35 100644 --- a/src/ng/httpBackend.js +++ b/src/ng/httpBackend.js @@ -17,7 +17,6 @@ function createXhr(method) { /** * @ngdoc service * @name $httpBackend - * @requires $browser * @requires $window * @requires $document * diff --git a/src/ng/location.js b/src/ng/location.js index 3a53ee1b..f22848e9 100644 --- a/src/ng/location.js +++ b/src/ng/location.js @@ -489,8 +489,6 @@ function locationGetterSetter(property, preprocess) { * @ngdoc service * @name $location * - * @requires $browser - * @requires $sniffer * @requires $rootElement * * @description diff --git a/src/ng/timeout.js b/src/ng/timeout.js index ff87c93b..8bca2962 100644 --- a/src/ng/timeout.js +++ b/src/ng/timeout.js @@ -10,7 +10,6 @@ function $TimeoutProvider() { /** * @ngdoc service * @name $timeout - * @requires $browser * * @description * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch diff --git a/src/ngCookies/cookies.js b/src/ngCookies/cookies.js index ec2f4a90..a94e241f 100644 --- a/src/ngCookies/cookies.js +++ b/src/ngCookies/cookies.js @@ -22,7 +22,6 @@ angular.module('ngCookies', ['ng']). /** * @ngdoc service * @name $cookies - * @requires $browser * * @description * Provides read/write access to browser's cookies. -- cgit v1.2.3