diff options
Diffstat (limited to 'src/ngResource/resource.js')
| -rw-r--r-- | src/ngResource/resource.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js index c165ffab..59ac3b3a 100644 --- a/src/ngResource/resource.js +++ b/src/ngResource/resource.js @@ -85,7 +85,8 @@ * GET request, otherwise if a cache instance built with * {@link ng.$cacheFactory $cacheFactory}, this cache will be used for * caching. - * - **`timeout`** – `{number}` – timeout in milliseconds. + * - **`timeout`** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} that + * should abort the request when resolved. * - **`withCredentials`** - `{boolean}` - whether to to set the `withCredentials` flag on the * XHR object. See {@link https://developer.mozilla.org/en/http_access_control#section_5 * requests with credentials} for more information. |