diff options
Diffstat (limited to 'src/ng')
| -rw-r--r-- | src/ng/browser.js | 4 | ||||
| -rw-r--r-- | src/ng/cacheFactory.js | 4 | ||||
| -rw-r--r-- | src/ng/compile.js | 2 | ||||
| -rw-r--r-- | src/ng/filter.js | 2 | ||||
| -rw-r--r-- | src/ng/http.js | 2 | ||||
| -rw-r--r-- | src/ng/location.js | 1 | ||||
| -rw-r--r-- | src/ng/parse.js | 2 |
7 files changed, 9 insertions, 8 deletions
diff --git a/src/ng/browser.js b/src/ng/browser.js index 8d6fa80b..bfece646 100644 --- a/src/ng/browser.js +++ b/src/ng/browser.js @@ -323,7 +323,7 @@ function Browser(window, document, $log, $sniffer) { /** * @name ng.$browser#defer * @methodOf ng.$browser - * @param {function()} fn A function, who's execution should be defered. + * @param {function()} fn A function, who's execution should be deferred. * @param {number=} [delay=0] of milliseconds to defer the function execution. * @returns {*} DeferId that can be used to cancel the task via `$browser.defer.cancel()`. * @@ -352,7 +352,7 @@ function Browser(window, document, $log, $sniffer) { * @methodOf ng.$browser.defer * * @description - * Cancels a defered task identified with `deferId`. + * Cancels a deferred task identified with `deferId`. * * @param {*} deferId Token returned by the `$browser.defer` function. * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully canceled. diff --git a/src/ng/cacheFactory.js b/src/ng/cacheFactory.js index 13d16e00..1a0cb549 100644 --- a/src/ng/cacheFactory.js +++ b/src/ng/cacheFactory.js @@ -194,8 +194,8 @@ function $CacheFactoryProvider() { * @name ng.$templateCache * * @description - * The first time a template is used, it is loaded in the template cache for quick retrieval. You can - * load templates directly into the cache in a `script` tag, or by consuming the `$templateCache` + * The first time a template is used, it is loaded in the template cache for quick retrieval. You can + * load templates directly into the cache in a `script` tag, or by consuming the `$templateCache` * service directly. * * Adding via the `script` tag: diff --git a/src/ng/compile.js b/src/ng/compile.js index 9e7f9553..5b12883d 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -1312,7 +1312,7 @@ var PREFIX_REGEXP = /^(x[\:\-_]|data[\:\-_])/i; /** * Converts all accepted directives format into proper directive name. * All of these will become 'myDirective': - * my:DiRective + * my:Directive * my-directive * x-my-directive * data-my:directive diff --git a/src/ng/filter.js b/src/ng/filter.js index ac345306..5c6ffd0f 100644 --- a/src/ng/filter.js +++ b/src/ng/filter.js @@ -30,7 +30,7 @@ * } * </pre> * - * The filter function is registered with the `$injector` under the filter name suffixe with `Filter`. + * The filter function is registered with the `$injector` under the filter name suffix with `Filter`. * <pre> * it('should be the same instance', inject( * function($filterProvider) { diff --git a/src/ng/http.js b/src/ng/http.js index 2aedeacb..b1344ec3 100644 --- a/src/ng/http.js +++ b/src/ng/http.js @@ -155,7 +155,7 @@ function $HttpProvider() { /** * Response interceptors go before "around" interceptors (no real reason, just - * had to pick one.) But they are already revesed, so we can't use unshift, hence + * had to pick one.) But they are already reversed, so we can't use unshift, hence * the splice. */ reversedInterceptors.splice(index, 0, { diff --git a/src/ng/location.js b/src/ng/location.js index a0f03a8e..6ae1066c 100644 --- a/src/ng/location.js +++ b/src/ng/location.js @@ -254,6 +254,7 @@ LocationHashbangInHtml5Url.prototype = * Change path, search and hash, when called with parameter and return `$location`. * * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`) + * @param {string=} replace The path that will be changed * @return {string} url */ url: function(url, replace) { diff --git a/src/ng/parse.js b/src/ng/parse.js index 102b3312..9660c76f 100644 --- a/src/ng/parse.js +++ b/src/ng/parse.js @@ -20,7 +20,7 @@ var $parseMinErr = minErr('$parse'); // the expression, which is a stronger but more expensive test. Since reflective calls are expensive anyway, this is not // such a big deal compared to static dereferencing. // -// This sandboxing techniqueue is not perfect and doesn't aim to be. The goal is to prevent exploits against the +// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits against the // expression language, but not to prevent exploits that were enabled by exposing sensitive JavaScript or browser apis // on Scope. Exposing such objects on a Scope is never a good practice and therefore we are not even trying to protect // against interaction with an object explicitly exposed in this way. |