aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Bacon Darwin2014-02-27 21:54:26 +0000
committerPeter Bacon Darwin2014-03-02 15:02:29 +0000
commite89139dc9dd4a9c104d71167bea4987b766767df (patch)
treea408120c247e7c4658f905453f2cb9c268a69114
parent26169075c84d89c13b22d225f415841e85ed1036 (diff)
downloadangular.js-e89139dc9dd4a9c104d71167bea4987b766767df.tar.bz2
docs(*): ensure jsdoc type expressions are valid
-rw-r--r--src/ng/directive/script.js2
-rw-r--r--src/ng/http.js3
-rw-r--r--src/ng/rootScope.js2
-rw-r--r--src/ngResource/resource.js2
-rw-r--r--src/ngRoute/route.js2
5 files changed, 5 insertions, 6 deletions
diff --git a/src/ng/directive/script.js b/src/ng/directive/script.js
index 43a7bd96..8638a3c2 100644
--- a/src/ng/directive/script.js
+++ b/src/ng/directive/script.js
@@ -12,7 +12,7 @@
* `<script>` element must be specified as `text/ng-template`, and a cache name for the template must be
* assigned through the element's `id`, which can then be used as a directive's `templateUrl`.
*
- * @param {'text/ng-template'} type Must be set to `'text/ng-template'`.
+ * @param {string} type Must be set to `'text/ng-template'`.
* @param {string} id Cache name of the template.
*
* @example
diff --git a/src/ng/http.js b/src/ng/http.js
index a19f146d..0c54f5bb 100644
--- a/src/ng/http.js
+++ b/src/ng/http.js
@@ -573,7 +573,7 @@ function $HttpProvider() {
* - **headers** – `{function([headerName])}` – Header getter function.
* - **config** – `{Object}` – The configuration object that was used to generate the request.
*
- * @property {Array.&ltObject&gt;} pendingRequests Array of config objects for currently pending
+ * @property {Array.<Object>} pendingRequests Array of config objects for currently pending
* requests. This is primarily meant to be used for debugging purposes.
*
*
@@ -875,7 +875,6 @@ function $HttpProvider() {
/**
* @ngdoc property
* @name $http#defaults
- * @propertyOf ng.$http
*
* @description
* Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
index 4878c3ec..9c75534c 100644
--- a/src/ng/rootScope.js
+++ b/src/ng/rootScope.js
@@ -870,7 +870,7 @@ function $RootScopeProvider(){
* - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
*
* @param {string} name Event name to listen on.
- * @param {function(event, args...)} listener Function to call when the event is emitted.
+ * @param {function(event, ...args)} listener Function to call when the event is emitted.
* @returns {function()} Returns a deregistration function for this listener.
*/
$on: function(name, listener) {
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
index 610c14fd..66433736 100644
--- a/src/ngResource/resource.js
+++ b/src/ngResource/resource.js
@@ -97,7 +97,7 @@ function shallowClearAndCopy(src, dst) {
* If the parameter value is prefixed with `@` then the value of that parameter is extracted from
* the data object (useful for non-GET operations).
*
- * @param {Object.&lt;Object&gt;=} actions Hash with declaration of custom action that should extend
+ * @param {Object.<Object>=} actions Hash with declaration of custom action that should extend
* the default set of resource actions. The declaration should be created in the format of {@link
* ng.$http#usage_parameters $http.config}:
*
diff --git a/src/ngRoute/route.js b/src/ngRoute/route.js
index e09e74db..a1236ec9 100644
--- a/src/ngRoute/route.js
+++ b/src/ngRoute/route.js
@@ -247,7 +247,7 @@ function $RouteProvider(){
* - `$scope` - The current route scope.
* - `$template` - The current route template HTML.
*
- * @property {Array.&lt;Object&gt;} routes Array of all configured routes.
+ * @property {Array.<Object>} routes Array of all configured routes.
*
* @description
* `$route` is used for deep-linking URLs to controllers and views (HTML partials).