diff options
67 files changed, 500 insertions, 679 deletions
diff --git a/src/Angular.js b/src/Angular.js index 189747a0..04169818 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -90,6 +90,7 @@ /** * @ngdoc module * @name ng + * @module ng * @description * * # ng (core module) @@ -1134,7 +1135,7 @@ function encodeUriQuery(val, pctEncodeSpaces) { /** * @ngdoc directive - * @name ng.directive:ngApp + * @name ngApp * @module ng * * @element ANY @@ -1153,7 +1154,7 @@ function encodeUriQuery(val, pctEncodeSpaces) { * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other. * * You can specify an **AngularJS module** to be used as the root module for the application. This - * module will be loaded into the {@link AUTO.$injector} when the application is bootstrapped and + * module will be loaded into the {@link auto.$injector} when the application is bootstrapped and * should contain the application code needed or have dependencies on other modules that will * contain the code. See {@link angular.module} for more information. * @@ -1239,7 +1240,7 @@ function angularInit(element, bootstrap) { * Each item in the array should be the name of a predefined module or a (DI annotated) * function that will be invoked by the injector as a run block. * See: {@link angular.module modules} - * @returns {AUTO.$injector} Returns the newly created injector for this app. + * @returns {auto.$injector} Returns the newly created injector for this app. */ function bootstrap(element, modules) { var doBootstrap = function() { diff --git a/src/AngularPublic.js b/src/AngularPublic.js index ed57b194..98a5094a 100644 --- a/src/AngularPublic.js +++ b/src/AngularPublic.js @@ -77,7 +77,7 @@ /** - * @ngdoc property + * @ngdoc object * @name angular.version * @module ng * @description diff --git a/src/auto/injector.js b/src/auto/injector.js index ee87b51e..977b5774 100644 --- a/src/auto/injector.js +++ b/src/auto/injector.js @@ -12,7 +12,7 @@ * @param {Array.<string|Function>} modules A list of module functions or their aliases. See * {@link angular.module}. The `ng` module must be explicitly added. - * @returns {function()} Injector function. See {@link AUTO.$injector $injector}. + * @returns {function()} Injector function. See {@link auto.$injector $injector}. * * @example * Typical usage @@ -53,11 +53,11 @@ /** - * @ngdoc overview - * @name AUTO + * @ngdoc module + * @name auto * @description * - * Implicit module which gets automatically added to each {@link AUTO.$injector $injector}. + * Implicit module which gets automatically added to each {@link auto.$injector $injector}. */ var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m; @@ -98,14 +98,14 @@ function annotate(fn) { /////////////////////////////////////// /** - * @ngdoc object - * @name AUTO.$injector + * @ngdoc service + * @name $injector * @function * * @description * * `$injector` is used to retrieve object instances as defined by - * {@link AUTO.$provide provider}, instantiate types, invoke methods, + * {@link auto.$provide provider}, instantiate types, invoke methods, * and load modules. * * The following always holds true: @@ -151,8 +151,7 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$injector#get - * @methodOf AUTO.$injector + * @name $injector#get * * @description * Return an instance of the service. @@ -163,8 +162,7 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$injector#invoke - * @methodOf AUTO.$injector + * @name $injector#invoke * * @description * Invoke the method and supply the method arguments from the `$injector`. @@ -179,8 +177,7 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$injector#has - * @methodOf AUTO.$injector + * @name $injector#has * * @description * Allows the user to query if the particular service exist. @@ -191,8 +188,7 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$injector#instantiate - * @methodOf AUTO.$injector + * @name $injector#instantiate * @description * Create a new instance of JS type. The method takes a constructor function invokes the new * operator and supplies all of the arguments to the constructor function as specified by the @@ -206,8 +202,7 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$injector#annotate - * @methodOf AUTO.$injector + * @name $injector#annotate * * @description * Returns an array of service names which the function is requesting for injection. This API is @@ -290,12 +285,12 @@ function annotate(fn) { /** * @ngdoc object - * @name AUTO.$provide + * @name $provide * * @description * - * The {@link AUTO.$provide $provide} service has a number of methods for registering components - * with the {@link AUTO.$injector $injector}. Many of these functions are also exposed on + * The {@link auto.$provide $provide} service has a number of methods for registering components + * with the {@link auto.$injector $injector}. Many of these functions are also exposed on * {@link angular.Module}. * * An Angular **service** is a singleton object created by a **service factory**. These **service @@ -303,25 +298,25 @@ function annotate(fn) { * The **service providers** are constructor functions. When instantiated they must contain a * property called `$get`, which holds the **service factory** function. * - * When you request a service, the {@link AUTO.$injector $injector} is responsible for finding the + * When you request a service, the {@link auto.$injector $injector} is responsible for finding the * correct **service provider**, instantiating it and then calling its `$get` **service factory** * function to get the instance of the **service**. * * Often services have no configuration options and there is no need to add methods to the service * provider. The provider will be no more than a constructor function with a `$get` property. For - * these cases the {@link AUTO.$provide $provide} service has additional helper methods to register + * these cases the {@link auto.$provide $provide} service has additional helper methods to register * services without specifying a provider. * - * * {@link AUTO.$provide#methods_provider provider(provider)} - registers a **service provider** with the - * {@link AUTO.$injector $injector} - * * {@link AUTO.$provide#methods_constant constant(obj)} - registers a value/object that can be accessed by + * * {@link auto.$provide#methods_provider provider(provider)} - registers a **service provider** with the + * {@link auto.$injector $injector} + * * {@link auto.$provide#methods_constant constant(obj)} - registers a value/object that can be accessed by * providers and services. - * * {@link AUTO.$provide#methods_value value(obj)} - registers a value/object that can only be accessed by + * * {@link auto.$provide#methods_value value(obj)} - registers a value/object that can only be accessed by * services, not providers. - * * {@link AUTO.$provide#methods_factory factory(fn)} - registers a service **factory function**, `fn`, + * * {@link auto.$provide#methods_factory factory(fn)} - registers a service **factory function**, `fn`, * that will be wrapped in a **service provider** object, whose `$get` property will contain the * given factory function. - * * {@link AUTO.$provide#methods_service service(class)} - registers a **constructor function**, `class` that + * * {@link auto.$provide#methods_service service(class)} - registers a **constructor function**, `class` that * that will be wrapped in a **service provider** object, whose `$get` property will instantiate * a new object using the given constructor function. * @@ -330,11 +325,10 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$provide#provider - * @methodOf AUTO.$provide + * @name $provide#provider * @description * - * Register a **provider function** with the {@link AUTO.$injector $injector}. Provider functions + * Register a **provider function** with the {@link auto.$injector $injector}. Provider functions * are constructor functions, whose instances are responsible for "providing" a factory for a * service. * @@ -354,16 +348,16 @@ function annotate(fn) { * @param {(Object|function())} provider If the provider is: * * - `Object`: then it should have a `$get` method. The `$get` method will be invoked using - * {@link AUTO.$injector#invoke $injector.invoke()} when an instance needs to be created. + * {@link auto.$injector#invoke $injector.invoke()} when an instance needs to be created. * - `Constructor`: a new instance of the provider will be created using - * {@link AUTO.$injector#instantiate $injector.instantiate()}, then treated as `object`. + * {@link auto.$injector#instantiate $injector.instantiate()}, then treated as `object`. * * @returns {Object} registered provider instance * @example * * The following example shows how to create a simple event tracking service and register it using - * {@link AUTO.$provide#methods_provider $provide.provider()}. + * {@link auto.$provide#methods_provider $provide.provider()}. * * <pre> * // Define the eventTracker provider @@ -427,14 +421,13 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$provide#factory - * @methodOf AUTO.$provide + * @name $provide#factory * @description * * Register a **service factory**, which will be called to return the service instance. * This is short for registering a service where its provider consists of only a `$get` property, * which is the given service factory function. - * You should use {@link AUTO.$provide#factory $provide.factory(getFn)} if you do not need to + * You should use {@link auto.$provide#factory $provide.factory(getFn)} if you do not need to * configure your service in a provider. * * @param {string} name The name of the instance. @@ -462,8 +455,7 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$provide#service - * @methodOf AUTO.$provide + * @name $provide#service * @description * * Register a **service constructor**, which will be invoked with `new` to create the service @@ -471,7 +463,7 @@ function annotate(fn) { * This is short for registering a service where its provider's `$get` property is the service * constructor function that will be used to instantiate the service instance. * - * You should use {@link AUTO.$provide#methods_service $provide.service(class)} if you define your service + * You should use {@link auto.$provide#methods_service $provide.service(class)} if you define your service * as a type/class. * * @param {string} name The name of the instance. @@ -480,7 +472,7 @@ function annotate(fn) { * * @example * Here is an example of registering a service using - * {@link AUTO.$provide#methods_service $provide.service(class)}. + * {@link auto.$provide#methods_service $provide.service(class)}. * <pre> * var Ping = function($http) { * this.$http = $http; @@ -504,11 +496,10 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$provide#value - * @methodOf AUTO.$provide + * @name $provide#value * @description * - * Register a **value service** with the {@link AUTO.$injector $injector}, such as a string, a + * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a * number, an array, an object or a function. This is short for registering a service where its * provider's `$get` property is a factory function that takes no arguments and returns the **value * service**. @@ -516,7 +507,7 @@ function annotate(fn) { * Value services are similar to constant services, except that they cannot be injected into a * module configuration function (see {@link angular.Module#config}) but they can be overridden by * an Angular - * {@link AUTO.$provide#decorator decorator}. + * {@link auto.$provide#decorator decorator}. * * @param {string} name The name of the instance. * @param {*} value The value. @@ -538,14 +529,13 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$provide#constant - * @methodOf AUTO.$provide + * @name $provide#constant * @description * * Register a **constant service**, such as a string, a number, an array, an object or a function, - * with the {@link AUTO.$injector $injector}. Unlike {@link AUTO.$provide#value value} it can be + * with the {@link auto.$injector $injector}. Unlike {@link auto.$provide#value value} it can be * injected into a module configuration function (see {@link angular.Module#config}) and it cannot - * be overridden by an Angular {@link AUTO.$provide#decorator decorator}. + * be overridden by an Angular {@link auto.$provide#decorator decorator}. * * @param {string} name The name of the constant. * @param {*} value The constant value. @@ -567,11 +557,10 @@ function annotate(fn) { /** * @ngdoc method - * @name AUTO.$provide#decorator - * @methodOf AUTO.$provide + * @name $provide#decorator * @description * - * Register a **service decorator** with the {@link AUTO.$injector $injector}. A service decorator + * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator * intercepts the creation of a service, allowing it to override or modify the behaviour of the * service. The object returned by the decorator may be the original service, or a new service * object which replaces or wraps and delegates to the original service. @@ -579,7 +568,7 @@ function annotate(fn) { * @param {string} name The name of the service to decorate. * @param {function()} decorator This function will be invoked when the service needs to be * instantiated and should return the decorated service instance. The function is called using - * the {@link AUTO.$injector#invoke injector.invoke} method and is therefore fully injectable. + * the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable. * Local injection arguments: * * * `$delegate` - The original service instance, which can be monkey patched, configured, diff --git a/src/loader.js b/src/loader.js index d41ff593..7184cb47 100644 --- a/src/loader.js +++ b/src/loader.js @@ -1,7 +1,7 @@ 'use strict'; /** - * @ngdoc interface + * @ngdoc type * @name angular.Module * @module ng * @description @@ -45,7 +45,7 @@ function setupModuleLoader(window) { * # Module * * A module is a collection of services, directives, filters, and configuration information. - * `angular.module` is used to configure the {@link AUTO.$injector $injector}. + * `angular.module` is used to configure the {@link auto.$injector $injector}. * * <pre> * // Create a new module @@ -137,12 +137,11 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#provider * @module ng - * @methodOf angular.Module * @param {string} name service name * @param {Function} providerType Construction function for creating new instance of the * service. * @description - * See {@link AUTO.$provide#provider $provide.provider()}. + * See {@link auto.$provide#provider $provide.provider()}. */ provider: invokeLater('$provide', 'provider'), @@ -150,11 +149,10 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#factory * @module ng - * @methodOf angular.Module * @param {string} name service name * @param {Function} providerFunction Function for creating new instance of the service. * @description - * See {@link AUTO.$provide#factory $provide.factory()}. + * See {@link auto.$provide#factory $provide.factory()}. */ factory: invokeLater('$provide', 'factory'), @@ -162,11 +160,10 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#service * @module ng - * @methodOf angular.Module * @param {string} name service name * @param {Function} constructor A constructor function that will be instantiated. * @description - * See {@link AUTO.$provide#service $provide.service()}. + * See {@link auto.$provide#service $provide.service()}. */ service: invokeLater('$provide', 'service'), @@ -174,11 +171,10 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#value * @module ng - * @methodOf angular.Module * @param {string} name service name * @param {*} object Service instance object. * @description - * See {@link AUTO.$provide#value $provide.value()}. + * See {@link auto.$provide#value $provide.value()}. */ value: invokeLater('$provide', 'value'), @@ -186,12 +182,11 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#constant * @module ng - * @methodOf angular.Module * @param {string} name constant name * @param {*} object Constant value. * @description * Because the constant are fixed, they get applied before other provide methods. - * See {@link AUTO.$provide#constant $provide.constant()}. + * See {@link auto.$provide#constant $provide.constant()}. */ constant: invokeLater('$provide', 'constant', 'unshift'), @@ -199,7 +194,6 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#animation * @module ng - * @methodOf angular.Module * @param {string} name animation name * @param {Function} animationFactory Factory function for creating new instance of an * animation. @@ -234,7 +228,6 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#filter * @module ng - * @methodOf angular.Module * @param {string} name Filter name. * @param {Function} filterFactory Factory function for creating new instance of filter. * @description @@ -246,7 +239,6 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#controller * @module ng - * @methodOf angular.Module * @param {string|Object} name Controller name, or an object map of controllers where the * keys are the names and the values are the constructors. * @param {Function} constructor Controller constructor function. @@ -259,7 +251,6 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#directive * @module ng - * @methodOf angular.Module * @param {string|Object} name Directive name, or an object map of directives where the * keys are the names and the values are the factories. * @param {Function} directiveFactory Factory function for creating new instance of @@ -273,7 +264,6 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#config * @module ng - * @methodOf angular.Module * @param {Function} configFn Execute this function on module load. Useful for service * configuration. * @description @@ -285,7 +275,6 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#run * @module ng - * @methodOf angular.Module * @param {Function} initializationFn Execute this function after injector creation. * Useful for application initialization. * @description diff --git a/src/ng/anchorScroll.js b/src/ng/anchorScroll.js index 4cef2bdf..4cb9a275 100644 --- a/src/ng/anchorScroll.js +++ b/src/ng/anchorScroll.js @@ -1,8 +1,9 @@ 'use strict'; /** - * @ngdoc function - * @name ng.$anchorScroll + * @ngdoc service + * @name $anchorScroll + * @kind function * @requires $window * @requires $location * @requires $rootScope diff --git a/src/ng/animate.js b/src/ng/animate.js index 1961d47b..11a287e6 100644 --- a/src/ng/animate.js +++ b/src/ng/animate.js @@ -3,8 +3,8 @@ var $animateMinErr = minErr('$animate'); /** - * @ngdoc object - * @name ng.$animateProvider + * @ngdoc provider + * @name $animateProvider * * @description * Default implementation of $animate that doesn't perform any animations, instead just @@ -22,9 +22,8 @@ var $AnimateProvider = ['$provide', function($provide) { /** - * @ngdoc function - * @name ng.$animateProvider#register - * @methodOf ng.$animateProvider + * @ngdoc method + * @name $animateProvider#register * * @description * Registers a new injectable animation factory function. The factory function produces the @@ -62,9 +61,8 @@ var $AnimateProvider = ['$provide', function($provide) { }; /** - * @ngdoc function - * @name ng.$animateProvider#classNameFilter - * @methodOf ng.$animateProvider + * @ngdoc method + * @name $animateProvider#classNameFilter * * @description * Sets and/or returns the CSS class regular expression that is checked when performing @@ -87,8 +85,8 @@ var $AnimateProvider = ['$provide', function($provide) { /** * - * @ngdoc object - * @name ng.$animate + * @ngdoc service + * @name $animate * @description The $animate service provides rudimentary DOM manipulation functions to * insert, remove and move elements within the DOM, as well as adding and removing classes. * This service is the core service used by the ngAnimate $animator service which provides @@ -106,9 +104,8 @@ var $AnimateProvider = ['$provide', function($provide) { /** * - * @ngdoc function - * @name ng.$animate#enter - * @methodOf ng.$animate + * @ngdoc method + * @name $animate#enter * @function * @description Inserts the element into the DOM either after the `after` element or within * the `parent` element. Once complete, the done() callback will be fired (if provided). @@ -134,9 +131,8 @@ var $AnimateProvider = ['$provide', function($provide) { /** * - * @ngdoc function - * @name ng.$animate#leave - * @methodOf ng.$animate + * @ngdoc method + * @name $animate#leave * @function * @description Removes the element from the DOM. Once complete, the done() callback will be * fired (if provided). @@ -151,9 +147,8 @@ var $AnimateProvider = ['$provide', function($provide) { /** * - * @ngdoc function - * @name ng.$animate#move - * @methodOf ng.$animate + * @ngdoc method + * @name $animate#move * @function * @description Moves the position of the provided element within the DOM to be placed * either after the `after` element or inside of the `parent` element. Once complete, the @@ -176,9 +171,8 @@ var $AnimateProvider = ['$provide', function($provide) { /** * - * @ngdoc function - * @name ng.$animate#addClass - * @methodOf ng.$animate + * @ngdoc method + * @name $animate#addClass * @function * @description Adds the provided className CSS class value to the provided element. Once * complete, the done() callback will be fired (if provided). @@ -200,9 +194,8 @@ var $AnimateProvider = ['$provide', function($provide) { /** * - * @ngdoc function - * @name ng.$animate#removeClass - * @methodOf ng.$animate + * @ngdoc method + * @name $animate#removeClass * @function * @description Removes the provided className CSS class value from the provided element. * Once complete, the done() callback will be fired (if provided). diff --git a/src/ng/browser.js b/src/ng/browser.js index 73606fe7..52a0b979 100644 --- a/src/ng/browser.js +++ b/src/ng/browser.js @@ -3,7 +3,7 @@ /** * ! This is a private undocumented service ! * - * @name ng.$browser + * @name $browser * @requires $log * @description * This object has two goals: @@ -87,8 +87,7 @@ function Browser(window, document, $log, $sniffer) { pollTimeout; /** - * @name ng.$browser#addPollFn - * @methodOf ng.$browser + * @name $browser#addPollFn * * @param {function()} fn Poll function to add * @@ -128,8 +127,7 @@ function Browser(window, document, $log, $sniffer) { newLocation = null; /** - * @name ng.$browser#url - * @methodOf ng.$browser + * @name $browser#url * * @description * GETTER: @@ -195,8 +193,7 @@ function Browser(window, document, $log, $sniffer) { } /** - * @name ng.$browser#onUrlChange - * @methodOf ng.$browser + * @name $browser#onUrlChange * @TODO(vojta): refactor to use node's syntax for events * * @description @@ -242,8 +239,7 @@ function Browser(window, document, $log, $sniffer) { ////////////////////////////////////////////////////////////// /** - * @name ng.$browser#baseHref - * @methodOf ng.$browser + * @name $browser#baseHref * * @description * Returns current <base href> @@ -264,8 +260,7 @@ function Browser(window, document, $log, $sniffer) { var cookiePath = self.baseHref(); /** - * @name ng.$browser#cookies - * @methodOf ng.$browser + * @name $browser#cookies * * @param {string=} name Cookie name * @param {string=} value Cookie value @@ -334,8 +329,7 @@ function Browser(window, document, $log, $sniffer) { /** - * @name ng.$browser#defer - * @methodOf ng.$browser + * @name $browser#defer * @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()`. @@ -361,8 +355,7 @@ function Browser(window, document, $log, $sniffer) { /** - * @name ng.$browser#defer.cancel - * @methodOf ng.$browser.defer + * @name $browser#defer.cancel * * @description * Cancels a deferred task identified with `deferId`. diff --git a/src/ng/cacheFactory.js b/src/ng/cacheFactory.js index 0e887c81..32d179b4 100644 --- a/src/ng/cacheFactory.js +++ b/src/ng/cacheFactory.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc object - * @name ng.$cacheFactory + * @ngdoc service + * @name $cacheFactory * * @description * Factory that constructs cache objects and gives access to them. @@ -156,8 +156,7 @@ function $CacheFactoryProvider() { /** * @ngdoc method - * @name ng.$cacheFactory#info - * @methodOf ng.$cacheFactory + * @name $cacheFactory#info * * @description * Get information about all the of the caches that have been created @@ -175,8 +174,7 @@ function $CacheFactoryProvider() { /** * @ngdoc method - * @name ng.$cacheFactory#get - * @methodOf ng.$cacheFactory + * @name $cacheFactory#get * * @description * Get access to a cache object by the `cacheId` used when it was created. @@ -194,8 +192,8 @@ function $CacheFactoryProvider() { } /** - * @ngdoc object - * @name ng.$templateCache + * @ngdoc service + * @name $templateCache * * @description * The first time a template is used, it is loaded in the template cache for quick retrieval. You diff --git a/src/ng/compile.js b/src/ng/compile.js index ded62ea9..219f99ae 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -19,8 +19,8 @@ /** - * @ngdoc function - * @name ng.$compile + * @ngdoc service + * @name $compile * @function * * @description @@ -491,8 +491,8 @@ var $compileMinErr = minErr('$compile'); /** - * @ngdoc service - * @name ng.$compileProvider + * @ngdoc provider + * @name $compileProvider * @function * * @description @@ -511,9 +511,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/; /** - * @ngdoc function - * @name ng.$compileProvider#directive - * @methodOf ng.$compileProvider + * @ngdoc method + * @name $compileProvider#directive * @function * * @description @@ -565,9 +564,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { /** - * @ngdoc function - * @name ng.$compileProvider#aHrefSanitizationWhitelist - * @methodOf ng.$compileProvider + * @ngdoc method + * @name $compileProvider#aHrefSanitizationWhitelist * @function * * @description @@ -596,9 +594,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { /** - * @ngdoc function - * @name ng.$compileProvider#imgSrcSanitizationWhitelist - * @methodOf ng.$compileProvider + * @ngdoc method + * @name $compileProvider#imgSrcSanitizationWhitelist * @function * * @description @@ -641,9 +638,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { /** - * @ngdoc function - * @name ng.$compile.directive.Attributes#$addClass - * @methodOf ng.$compile.directive.Attributes + * @ngdoc method + * @name $compile.directive.Attributes#$addClass * @function * * @description @@ -659,9 +655,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { }, /** - * @ngdoc function - * @name ng.$compile.directive.Attributes#$removeClass - * @methodOf ng.$compile.directive.Attributes + * @ngdoc method + * @name $compile.directive.Attributes#$removeClass * @function * * @description @@ -677,9 +672,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { }, /** - * @ngdoc function - * @name ng.$compile.directive.Attributes#$updateClass - * @methodOf ng.$compile.directive.Attributes + * @ngdoc method + * @name $compile.directive.Attributes#$updateClass * @function * * @description @@ -766,9 +760,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { /** - * @ngdoc function - * @name ng.$compile.directive.Attributes#$observe - * @methodOf ng.$compile.directive.Attributes + * @ngdoc method + * @name $compile.directive.Attributes#$observe * @function * * @description @@ -1969,8 +1962,8 @@ function directiveNormalize(name) { } /** - * @ngdoc object - * @name ng.$compile.directive.Attributes + * @ngdoc type + * @name $compile.directive.Attributes * * @description * A shared object between directive compile / linking functions which contains normalized DOM @@ -1982,17 +1975,15 @@ function directiveNormalize(name) { /** * @ngdoc property - * @name ng.$compile.directive.Attributes#$attr - * @propertyOf ng.$compile.directive.Attributes + * @name $compile.directive.Attributes#$attr * @returns {object} A map of DOM element attribute names to the normalized name. This is * needed to do reverse lookup from normalized name back to actual name. */ /** - * @ngdoc function - * @name ng.$compile.directive.Attributes#$set - * @methodOf ng.$compile.directive.Attributes + * @ngdoc method + * @name $compile.directive.Attributes#$set * @function * * @description diff --git a/src/ng/controller.js b/src/ng/controller.js index 938fbfbe..1a610b9c 100644 --- a/src/ng/controller.js +++ b/src/ng/controller.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc object - * @name ng.$controllerProvider + * @ngdoc provider + * @name $controllerProvider * @description * The {@link ng.$controller $controller service} is used by Angular to create new * controllers. @@ -16,9 +16,8 @@ function $ControllerProvider() { /** - * @ngdoc function - * @name ng.$controllerProvider#register - * @methodOf ng.$controllerProvider + * @ngdoc method + * @name $controllerProvider#register * @param {string|Object} name Controller name, or an object map of controllers where the keys are * the names and the values are the constructors. * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI @@ -37,8 +36,8 @@ function $ControllerProvider() { this.$get = ['$injector', '$window', function($injector, $window) { /** - * @ngdoc function - * @name ng.$controller + * @ngdoc service + * @name $controller * @requires $injector * * @param {Function|string} constructor If called with a function then it's considered to be the @@ -55,7 +54,7 @@ function $ControllerProvider() { * @description * `$controller` service is responsible for instantiating controllers. * - * It's just a simple call to {@link AUTO.$injector $injector}, but extracted into + * It's just a simple call to {@link auto.$injector $injector}, but extracted into * a service, so that one can override this service with {@link https://gist.github.com/1649788 * BC version}. */ diff --git a/src/ng/directive/a.js b/src/ng/directive/a.js index 9887cba5..850d7d6d 100644 --- a/src/ng/directive/a.js +++ b/src/ng/directive/a.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:a + * @name a * @restrict E * * @description diff --git a/src/ng/directive/booleanAttrs.js b/src/ng/directive/booleanAttrs.js index 6762ab2d..d2ba61df 100644 --- a/src/ng/directive/booleanAttrs.js +++ b/src/ng/directive/booleanAttrs.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngHref + * @name ngHref * @restrict A * @priority 99 * @@ -95,7 +95,7 @@ /** * @ngdoc directive - * @name ng.directive:ngSrc + * @name ngSrc * @restrict A * @priority 99 * @@ -121,7 +121,7 @@ /** * @ngdoc directive - * @name ng.directive:ngSrcset + * @name ngSrcset * @restrict A * @priority 99 * @@ -147,7 +147,7 @@ /** * @ngdoc directive - * @name ng.directive:ngDisabled + * @name ngDisabled * @restrict A * @priority 100 * @@ -191,7 +191,7 @@ /** * @ngdoc directive - * @name ng.directive:ngChecked + * @name ngChecked * @restrict A * @priority 100 * @@ -226,7 +226,7 @@ /** * @ngdoc directive - * @name ng.directive:ngReadonly + * @name ngReadonly * @restrict A * @priority 100 * @@ -261,7 +261,7 @@ /** * @ngdoc directive - * @name ng.directive:ngSelected + * @name ngSelected * @restrict A * @priority 100 * @@ -299,7 +299,7 @@ /** * @ngdoc directive - * @name ng.directive:ngOpen + * @name ngOpen * @restrict A * @priority 100 * diff --git a/src/ng/directive/form.js b/src/ng/directive/form.js index 86776ae7..31034730 100644 --- a/src/ng/directive/form.js +++ b/src/ng/directive/form.js @@ -10,8 +10,8 @@ var nullFormCtrl = { }; /** - * @ngdoc object - * @name ng.directive:form.FormController + * @ngdoc type + * @name form.FormController * * @property {boolean} $pristine True if user has not interacted with the form yet. * @property {boolean} $dirty True if user has already interacted with the form. @@ -76,9 +76,8 @@ function FormController(element, attrs) { } /** - * @ngdoc function - * @name ng.directive:form.FormController#$addControl - * @methodOf ng.directive:form.FormController + * @ngdoc method + * @name form.FormController#$addControl * * @description * Register a control with the form. @@ -97,9 +96,8 @@ function FormController(element, attrs) { }; /** - * @ngdoc function - * @name ng.directive:form.FormController#$removeControl - * @methodOf ng.directive:form.FormController + * @ngdoc method + * @name form.FormController#$removeControl * * @description * Deregister a control from the form. @@ -118,9 +116,8 @@ function FormController(element, attrs) { }; /** - * @ngdoc function - * @name ng.directive:form.FormController#$setValidity - * @methodOf ng.directive:form.FormController + * @ngdoc method + * @name form.FormController#$setValidity * * @description * Sets the validity of a form control. @@ -166,9 +163,8 @@ function FormController(element, attrs) { }; /** - * @ngdoc function - * @name ng.directive:form.FormController#$setDirty - * @methodOf ng.directive:form.FormController + * @ngdoc method + * @name form.FormController#$setDirty * * @description * Sets the form to a dirty state. @@ -184,9 +180,8 @@ function FormController(element, attrs) { }; /** - * @ngdoc function - * @name ng.directive:form.FormController#$setPristine - * @methodOf ng.directive:form.FormController + * @ngdoc method + * @name form.FormController#$setPristine * * @description * Sets the form to its pristine state. @@ -211,7 +206,7 @@ function FormController(element, attrs) { /** * @ngdoc directive - * @name ng.directive:ngForm + * @name ngForm * @restrict EAC * * @description @@ -226,7 +221,7 @@ function FormController(element, attrs) { /** * @ngdoc directive - * @name ng.directive:form + * @name form * @restrict E * * @description diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js index d80697a3..ced50167 100644 --- a/src/ng/directive/input.js +++ b/src/ng/directive/input.js @@ -15,8 +15,8 @@ var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/; var inputType = { /** - * @ngdoc inputType - * @name ng.directive:input.text + * @ngdoc input + * @name input[text] * * @description * Standard HTML text input with angular data binding. @@ -93,8 +93,8 @@ var inputType = { /** - * @ngdoc inputType - * @name ng.directive:input.number + * @ngdoc input + * @name input[number] * * @description * Text input with number validation and transformation. Sets the `number` validation @@ -170,8 +170,8 @@ var inputType = { /** - * @ngdoc inputType - * @name ng.directive:input.url + * @ngdoc input + * @name input[url] * * @description * Text input with URL validation. Sets the `url` validation error key if the content is not a @@ -246,8 +246,8 @@ var inputType = { /** - * @ngdoc inputType - * @name ng.directive:input.email + * @ngdoc input + * @name input[email] * * @description * Text input with email validation. Sets the `email` validation error key if not a valid email @@ -321,8 +321,8 @@ var inputType = { /** - * @ngdoc inputType - * @name ng.directive:input.radio + * @ngdoc input + * @name input[radio] * * @description * HTML radio button. @@ -372,8 +372,8 @@ var inputType = { /** - * @ngdoc inputType - * @name ng.directive:input.checkbox + * @ngdoc input + * @name input[checkbox] * * @description * HTML checkbox. @@ -690,7 +690,7 @@ function checkboxInputType(scope, element, attr, ctrl) { /** * @ngdoc directive - * @name ng.directive:textarea + * @name textarea * @restrict E * * @description @@ -718,7 +718,7 @@ function checkboxInputType(scope, element, attr, ctrl) { /** * @ngdoc directive - * @name ng.directive:input + * @name input * @restrict E * * @description @@ -845,8 +845,8 @@ var VALID_CLASS = 'ng-valid', DIRTY_CLASS = 'ng-dirty'; /** - * @ngdoc object - * @name ng.directive:ngModel.NgModelController + * @ngdoc type + * @name ngModel.NgModelController * * @property {string} $viewValue Actual string value in the view. * @property {*} $modelValue The value in the model, that the control is bound to. @@ -1000,9 +1000,8 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ } /** - * @ngdoc function - * @name ng.directive:ngModel.NgModelController#$render - * @methodOf ng.directive:ngModel.NgModelController + * @ngdoc method + * @name ngModel.NgModelController#$render * * @description * Called when the view needs to be updated. It is expected that the user of the ng-model @@ -1011,9 +1010,8 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ this.$render = noop; /** - * @ngdoc function - * @name { ng.directive:ngModel.NgModelController#$isEmpty - * @methodOf ng.directive:ngModel.NgModelController + * @ngdoc method + * @name ngModel.NgModelController#$isEmpty * * @description * This is called when we need to determine if the value of the input is empty. @@ -1050,9 +1048,8 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ } /** - * @ngdoc function - * @name ng.directive:ngModel.NgModelController#$setValidity - * @methodOf ng.directive:ngModel.NgModelController + * @ngdoc method + * @name ngModel.NgModelController#$setValidity * * @description * Change the validity state, and notifies the form when the control changes validity. (i.e. it @@ -1094,9 +1091,8 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ }; /** - * @ngdoc function - * @name ng.directive:ngModel.NgModelController#$setPristine - * @methodOf ng.directive:ngModel.NgModelController + * @ngdoc method + * @name ngModel.NgModelController#$setPristine * * @description * Sets the control to its pristine state. @@ -1111,9 +1107,8 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ }; /** - * @ngdoc function - * @name ng.directive:ngModel.NgModelController#$setViewValue - * @methodOf ng.directive:ngModel.NgModelController + * @ngdoc method + * @name ngModel.NgModelController#$setViewValue * * @description * Update the view value. @@ -1190,7 +1185,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ /** * @ngdoc directive - * @name ng.directive:ngModel + * @name ngModel * * @element input * @@ -1251,7 +1246,7 @@ var ngModelDirective = function() { /** * @ngdoc directive - * @name ng.directive:ngChange + * @name ngChange * * @description * Evaluate the given expression when the user changes the input. @@ -1347,7 +1342,7 @@ var requiredDirective = function() { /** * @ngdoc directive - * @name ng.directive:ngList + * @name ngList * * @description * Text input that converts between a delimited string and an array of strings. The delimiter @@ -1442,7 +1437,7 @@ var ngListDirective = function() { var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/; /** * @ngdoc directive - * @name ng.directive:ngValue + * @name ngValue * * @description * Binds the given expression to the value of `input[select]` or `input[radio]`, so diff --git a/src/ng/directive/ngBind.js b/src/ng/directive/ngBind.js index 5d0e3009..82bbfab2 100644 --- a/src/ng/directive/ngBind.js +++ b/src/ng/directive/ngBind.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngBind + * @name ngBind * @restrict AC * * @description @@ -64,7 +64,7 @@ var ngBindDirective = ngDirective(function(scope, element, attr) { /** * @ngdoc directive - * @name ng.directive:ngBindTemplate + * @name ngBindTemplate * * @description * The `ngBindTemplate` directive specifies that the element @@ -126,7 +126,7 @@ var ngBindTemplateDirective = ['$interpolate', function($interpolate) { /** * @ngdoc directive - * @name ng.directive:ngBindHtml + * @name ngBindHtml * * @description * Creates a binding that will innerHTML the result of evaluating the `expression` into the current diff --git a/src/ng/directive/ngClass.js b/src/ng/directive/ngClass.js index 3f3ee4eb..17ace582 100644 --- a/src/ng/directive/ngClass.js +++ b/src/ng/directive/ngClass.js @@ -64,7 +64,7 @@ function classDirective(name, selector) { /** * @ngdoc directive - * @name ng.directive:ngClass + * @name ngClass * @restrict AC * * @description @@ -198,7 +198,7 @@ var ngClassDirective = classDirective('', true); /** * @ngdoc directive - * @name ng.directive:ngClassOdd + * @name ngClassOdd * @restrict AC * * @description @@ -246,7 +246,7 @@ var ngClassOddDirective = classDirective('Odd', 0); /** * @ngdoc directive - * @name ng.directive:ngClassEven + * @name ngClassEven * @restrict AC * * @description diff --git a/src/ng/directive/ngCloak.js b/src/ng/directive/ngCloak.js index 220c964d..0ef5090f 100644 --- a/src/ng/directive/ngCloak.js +++ b/src/ng/directive/ngCloak.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngCloak + * @name ngCloak * @restrict AC * * @description diff --git a/src/ng/directive/ngController.js b/src/ng/directive/ngController.js index 7149d090..6d294cc9 100644 --- a/src/ng/directive/ngController.js +++ b/src/ng/directive/ngController.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngController + * @name ngController * * @description * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular diff --git a/src/ng/directive/ngCsp.js b/src/ng/directive/ngCsp.js index fc90d46a..9dc93f81 100644 --- a/src/ng/directive/ngCsp.js +++ b/src/ng/directive/ngCsp.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngCsp + * @name ngCsp * * @element html * @description diff --git a/src/ng/directive/ngEventDirs.js b/src/ng/directive/ngEventDirs.js index 45b2d404..156acce1 100644 --- a/src/ng/directive/ngEventDirs.js +++ b/src/ng/directive/ngEventDirs.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngClick + * @name ngClick * * @description * The ngClick directive allows you to specify custom behavior when @@ -60,7 +60,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngDblclick + * @name ngDblclick * * @description * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event. @@ -84,7 +84,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngMousedown + * @name ngMousedown * * @description * The ngMousedown directive allows you to specify custom behavior on mousedown event. @@ -108,7 +108,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngMouseup + * @name ngMouseup * * @description * Specify custom behavior on mouseup event. @@ -131,7 +131,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngMouseover + * @name ngMouseover * * @description * Specify custom behavior on mouseover event. @@ -155,7 +155,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngMouseenter + * @name ngMouseenter * * @description * Specify custom behavior on mouseenter event. @@ -179,7 +179,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngMouseleave + * @name ngMouseleave * * @description * Specify custom behavior on mouseleave event. @@ -203,7 +203,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngMousemove + * @name ngMousemove * * @description * Specify custom behavior on mousemove event. @@ -227,7 +227,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngKeydown + * @name ngKeydown * * @description * Specify custom behavior on keydown event. @@ -249,7 +249,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngKeyup + * @name ngKeyup * * @description * Specify custom behavior on keyup event. @@ -271,7 +271,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngKeypress + * @name ngKeypress * * @description * Specify custom behavior on keypress event. @@ -292,7 +292,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngSubmit + * @name ngSubmit * * @description * Enables binding angular expressions to onsubmit events. @@ -346,7 +346,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngFocus + * @name ngFocus * * @description * Specify custom behavior on focus event. @@ -362,7 +362,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngBlur + * @name ngBlur * * @description * Specify custom behavior on blur event. @@ -378,7 +378,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngCopy + * @name ngCopy * * @description * Specify custom behavior on copy event. @@ -399,7 +399,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngCut + * @name ngCut * * @description * Specify custom behavior on cut event. @@ -420,7 +420,7 @@ forEach( /** * @ngdoc directive - * @name ng.directive:ngPaste + * @name ngPaste * * @description * Specify custom behavior on paste event. diff --git a/src/ng/directive/ngIf.js b/src/ng/directive/ngIf.js index e132f13b..9adb7080 100644 --- a/src/ng/directive/ngIf.js +++ b/src/ng/directive/ngIf.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngIf + * @name ngIf * @restrict A * * @description diff --git a/src/ng/directive/ngInclude.js b/src/ng/directive/ngInclude.js index b559b576..47bf742f 100644 --- a/src/ng/directive/ngInclude.js +++ b/src/ng/directive/ngInclude.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngInclude + * @name ngInclude * @restrict ECA * * @description @@ -145,7 +145,7 @@ /** * @ngdoc event - * @name ng.directive:ngInclude#$includeContentRequested + * @name ngInclude#$includeContentRequested * @eventOf ng.directive:ngInclude * @eventType emit on the scope ngInclude was declared in * @description @@ -155,7 +155,7 @@ /** * @ngdoc event - * @name ng.directive:ngInclude#$includeContentLoaded + * @name ngInclude#$includeContentLoaded * @eventOf ng.directive:ngInclude * @eventType emit on the current ngInclude scope * @description diff --git a/src/ng/directive/ngInit.js b/src/ng/directive/ngInit.js index d5a1e245..8dd05c9b 100644 --- a/src/ng/directive/ngInit.js +++ b/src/ng/directive/ngInit.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngInit + * @name ngInit * @restrict AC * * @description diff --git a/src/ng/directive/ngNonBindable.js b/src/ng/directive/ngNonBindable.js index 16073376..cf98f531 100644 --- a/src/ng/directive/ngNonBindable.js +++ b/src/ng/directive/ngNonBindable.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngNonBindable + * @name ngNonBindable * @restrict AC * @priority 1000 * diff --git a/src/ng/directive/ngPluralize.js b/src/ng/directive/ngPluralize.js index 58af4515..a33735e9 100644 --- a/src/ng/directive/ngPluralize.js +++ b/src/ng/directive/ngPluralize.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngPluralize + * @name ngPluralize * @restrict EA * * @description diff --git a/src/ng/directive/ngRepeat.js b/src/ng/directive/ngRepeat.js index e819877c..f83bb88f 100644 --- a/src/ng/directive/ngRepeat.js +++ b/src/ng/directive/ngRepeat.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngRepeat + * @name ngRepeat * * @description * The `ngRepeat` directive instantiates a template once per item from a collection. Each template diff --git a/src/ng/directive/ngShowHide.js b/src/ng/directive/ngShowHide.js index ba33bb1a..c4754bee 100644 --- a/src/ng/directive/ngShowHide.js +++ b/src/ng/directive/ngShowHide.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngShow + * @name ngShow * * @description * The `ngShow` directive shows or hides the given HTML element based on the expression @@ -159,7 +159,7 @@ var ngShowDirective = ['$animate', function($animate) { /** * @ngdoc directive - * @name ng.directive:ngHide + * @name ngHide * * @description * The `ngHide` directive shows or hides the given HTML element based on the expression diff --git a/src/ng/directive/ngStyle.js b/src/ng/directive/ngStyle.js index 05dcfab1..1722ca77 100644 --- a/src/ng/directive/ngStyle.js +++ b/src/ng/directive/ngStyle.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngStyle + * @name ngStyle * @restrict AC * * @description diff --git a/src/ng/directive/ngSwitch.js b/src/ng/directive/ngSwitch.js index 97029d41..0c9d4760 100644 --- a/src/ng/directive/ngSwitch.js +++ b/src/ng/directive/ngSwitch.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngSwitch + * @name ngSwitch * @restrict EA * * @description diff --git a/src/ng/directive/ngTransclude.js b/src/ng/directive/ngTransclude.js index 86b5ff61..95606b65 100644 --- a/src/ng/directive/ngTransclude.js +++ b/src/ng/directive/ngTransclude.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:ngTransclude + * @name ngTransclude * @restrict AC * * @description diff --git a/src/ng/directive/script.js b/src/ng/directive/script.js index e86285ae..229f3542 100644 --- a/src/ng/directive/script.js +++ b/src/ng/directive/script.js @@ -2,7 +2,7 @@ /** * @ngdoc directive - * @name ng.directive:script + * @name script * @restrict E * * @description diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js index c4498f81..0b01e612 100644 --- a/src/ng/directive/select.js +++ b/src/ng/directive/select.js @@ -3,7 +3,7 @@ var ngOptionsMinErr = minErr('ngOptions'); /** * @ngdoc directive - * @name ng.directive:select + * @name select * @restrict E * * @description diff --git a/src/ng/document.js b/src/ng/document.js index 570f9360..cc760477 100644 --- a/src/ng/document.js +++ b/src/ng/document.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc object - * @name ng.$document + * @ngdoc service + * @name $document * @requires $window * * @description diff --git a/src/ng/exceptionHandler.js b/src/ng/exceptionHandler.js index c3795bb7..13f775ef 100644 --- a/src/ng/exceptionHandler.js +++ b/src/ng/exceptionHandler.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc function - * @name ng.$exceptionHandler + * @ngdoc service + * @name $exceptionHandler * @requires $log * * @description diff --git a/src/ng/filter.js b/src/ng/filter.js index 15180edb..8e4254e2 100644 --- a/src/ng/filter.js +++ b/src/ng/filter.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc object - * @name ng.$filterProvider + * @ngdoc provider + * @name $filterProvider * @description * * Filters are just functions which transform input to an output. However filters need to be @@ -51,8 +51,7 @@ */ /** * @ngdoc method - * @name ng.$filterProvider#register - * @methodOf ng.$filterProvider + * @name $filterProvider#register * @description * Register filter factory function. * @@ -62,8 +61,8 @@ /** - * @ngdoc function - * @name ng.$filter + * @ngdoc service + * @name $filter * @function * @description * Filters are used for formatting data displayed to the user. @@ -80,9 +79,8 @@ function $FilterProvider($provide) { var suffix = 'Filter'; /** - * @ngdoc function - * @name ng.$controllerProvider#register - * @methodOf ng.$controllerProvider + * @ngdoc method + * @name $controllerProvider#register * @param {string|Object} name Name of the filter function, or an object map of filters where * the keys are the filter names and the values are the filter factories. * @returns {Object} Registered filter instance, or if a map of filters was provided then a map diff --git a/src/ng/filter/filter.js b/src/ng/filter/filter.js index 2bb0d174..a7ac1d0a 100644 --- a/src/ng/filter/filter.js +++ b/src/ng/filter/filter.js @@ -2,7 +2,7 @@ /** * @ngdoc filter - * @name ng.filter:filter + * @name filter * @function * * @description diff --git a/src/ng/filter/filters.js b/src/ng/filter/filters.js index b8cc655c..85bf120f 100644 --- a/src/ng/filter/filters.js +++ b/src/ng/filter/filters.js @@ -2,7 +2,7 @@ /** * @ngdoc filter - * @name ng.filter:currency + * @name currency * @function * * @description @@ -59,7 +59,7 @@ function currencyFilter($locale) { /** * @ngdoc filter - * @name ng.filter:number + * @name number * @function * * @description @@ -271,7 +271,7 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+ /** * @ngdoc filter - * @name ng.filter:date + * @name date * @function * * @description @@ -428,7 +428,7 @@ function dateFilter($locale) { /** * @ngdoc filter - * @name ng.filter:json + * @name json * @function * * @description @@ -463,7 +463,7 @@ function jsonFilter() { /** * @ngdoc filter - * @name ng.filter:lowercase + * @name lowercase * @function * @description * Converts string to lowercase. @@ -474,7 +474,7 @@ var lowercaseFilter = valueFn(lowercase); /** * @ngdoc filter - * @name ng.filter:uppercase + * @name uppercase * @function * @description * Converts string to uppercase. diff --git a/src/ng/filter/limitTo.js b/src/ng/filter/limitTo.js index bb1756f2..264cba1c 100644 --- a/src/ng/filter/limitTo.js +++ b/src/ng/filter/limitTo.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc function - * @name ng.filter:limitTo + * @ngdoc filter + * @name limitTo * @function * * @description diff --git a/src/ng/filter/orderBy.js b/src/ng/filter/orderBy.js index 4127f902..3e06ac95 100644 --- a/src/ng/filter/orderBy.js +++ b/src/ng/filter/orderBy.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc function - * @name ng.filter:orderBy + * @ngdoc filter + * @name orderBy * @function * * @description diff --git a/src/ng/http.js b/src/ng/http.js index 57dc7172..aa8c4071 100644 --- a/src/ng/http.js +++ b/src/ng/http.js @@ -171,8 +171,9 @@ function $HttpProvider() { /** - * @ngdoc function - * @name ng.$http + * @ngdoc service + * @kind function + * @name $http * @requires $httpBackend * @requires $browser * @requires $cacheFactory @@ -797,8 +798,7 @@ function $HttpProvider() { /** * @ngdoc method - * @name ng.$http#get - * @methodOf ng.$http + * @name $http#get * * @description * Shortcut method to perform `GET` request. @@ -810,8 +810,7 @@ function $HttpProvider() { /** * @ngdoc method - * @name ng.$http#delete - * @methodOf ng.$http + * @name $http#delete * * @description * Shortcut method to perform `DELETE` request. @@ -823,8 +822,7 @@ function $HttpProvider() { /** * @ngdoc method - * @name ng.$http#head - * @methodOf ng.$http + * @name $http#head * * @description * Shortcut method to perform `HEAD` request. @@ -836,8 +834,7 @@ function $HttpProvider() { /** * @ngdoc method - * @name ng.$http#jsonp - * @methodOf ng.$http + * @name $http#jsonp * * @description * Shortcut method to perform `JSONP` request. @@ -851,8 +848,7 @@ function $HttpProvider() { /** * @ngdoc method - * @name ng.$http#post - * @methodOf ng.$http + * @name $http#post * * @description * Shortcut method to perform `POST` request. @@ -865,8 +861,7 @@ function $HttpProvider() { /** * @ngdoc method - * @name ng.$http#put - * @methodOf ng.$http + * @name $http#put * * @description * Shortcut method to perform `PUT` request. @@ -880,7 +875,7 @@ function $HttpProvider() { /** * @ngdoc property - * @name ng.$http#defaults + * @name $http#defaults * @propertyOf ng.$http * * @description diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js index efe72060..415cd19f 100644 --- a/src/ng/httpBackend.js +++ b/src/ng/httpBackend.js @@ -15,8 +15,8 @@ function createXhr(method) { } /** - * @ngdoc object - * @name ng.$httpBackend + * @ngdoc service + * @name $httpBackend * @requires $browser * @requires $window * @requires $document diff --git a/src/ng/interpolate.js b/src/ng/interpolate.js index 1c02c40f..0665fd25 100644 --- a/src/ng/interpolate.js +++ b/src/ng/interpolate.js @@ -3,8 +3,8 @@ var $interpolateMinErr = minErr('$interpolate'); /** - * @ngdoc object - * @name ng.$interpolateProvider + * @ngdoc provider + * @name $interpolateProvider * @function * * @description @@ -44,8 +44,7 @@ function $InterpolateProvider() { /** * @ngdoc method - * @name ng.$interpolateProvider#startSymbol - * @methodOf ng.$interpolateProvider + * @name $interpolateProvider#startSymbol * @description * Symbol to denote start of expression in the interpolated string. Defaults to `{{`. * @@ -63,8 +62,7 @@ function $InterpolateProvider() { /** * @ngdoc method - * @name ng.$interpolateProvider#endSymbol - * @methodOf ng.$interpolateProvider + * @name $interpolateProvider#endSymbol * @description * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. * @@ -86,8 +84,8 @@ function $InterpolateProvider() { endSymbolLength = endSymbol.length; /** - * @ngdoc function - * @name ng.$interpolate + * @ngdoc service + * @name $interpolate * @function * * @requires $parse @@ -205,8 +203,7 @@ function $InterpolateProvider() { /** * @ngdoc method - * @name ng.$interpolate#startSymbol - * @methodOf ng.$interpolate + * @name $interpolate#startSymbol * @description * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`. * @@ -222,8 +219,7 @@ function $InterpolateProvider() { /** * @ngdoc method - * @name ng.$interpolate#endSymbol - * @methodOf ng.$interpolate + * @name $interpolate#endSymbol * @description * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. * diff --git a/src/ng/interval.js b/src/ng/interval.js index cd823f59..d528ebe1 100644 --- a/src/ng/interval.js +++ b/src/ng/interval.js @@ -8,8 +8,8 @@ function $IntervalProvider() { /** - * @ngdoc function - * @name ng.$interval + * @ngdoc service + * @name $interval * * @description * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay` @@ -162,9 +162,8 @@ function $IntervalProvider() { /** - * @ngdoc function - * @name ng.$interval#cancel - * @methodOf ng.$interval + * @ngdoc method + * @name $interval#cancel * * @description * Cancels a task associated with the `promise`. diff --git a/src/ng/locale.js b/src/ng/locale.js index 23df4275..b498f47d 100644 --- a/src/ng/locale.js +++ b/src/ng/locale.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc object - * @name ng.$locale + * @ngdoc service + * @name $locale * * @description * $locale service provides localization rules for various Angular components. As of right now the diff --git a/src/ng/location.js b/src/ng/location.js index c7a2f402..99783fc5 100644 --- a/src/ng/location.js +++ b/src/ng/location.js @@ -289,8 +289,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#absUrl - * @methodOf ng.$location + * @name $location#absUrl * * @description * This method is getter only. @@ -304,8 +303,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#url - * @methodOf ng.$location + * @name $location#url * * @description * This method is getter / setter. @@ -332,8 +330,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#protocol - * @methodOf ng.$location + * @name $location#protocol * * @description * This method is getter only. @@ -346,8 +343,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#host - * @methodOf ng.$location + * @name $location#host * * @description * This method is getter only. @@ -360,8 +356,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#port - * @methodOf ng.$location + * @name $location#port * * @description * This method is getter only. @@ -374,8 +369,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#path - * @methodOf ng.$location + * @name $location#path * * @description * This method is getter / setter. @@ -396,8 +390,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#search - * @methodOf ng.$location + * @name $location#search * * @description * This method is getter / setter. @@ -444,8 +437,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#hash - * @methodOf ng.$location + * @name $location#hash * * @description * This method is getter / setter. @@ -461,8 +453,7 @@ LocationHashbangInHtml5Url.prototype = /** * @ngdoc method - * @name ng.$location#replace - * @methodOf ng.$location + * @name $location#replace * * @description * If called, all changes to $location during current `$digest` will be replacing current history @@ -495,8 +486,8 @@ function locationGetterSetter(property, preprocess) { /** - * @ngdoc object - * @name ng.$location + * @ngdoc service + * @name $location * * @requires $browser * @requires $sniffer @@ -525,7 +516,7 @@ function locationGetterSetter(property, preprocess) { /** * @ngdoc object - * @name ng.$locationProvider + * @name $locationProvider * @description * Use the `$locationProvider` to configure how the application deep linking paths are stored. */ @@ -535,8 +526,7 @@ function $LocationProvider(){ /** * @ngdoc property - * @name ng.$locationProvider#hashPrefix - * @methodOf ng.$locationProvider + * @name $locationProvider#hashPrefix * @description * @param {string=} prefix Prefix for hash part (containing path and search) * @returns {*} current value if used as getter or itself (chaining) if used as setter @@ -552,8 +542,7 @@ function $LocationProvider(){ /** * @ngdoc property - * @name ng.$locationProvider#html5Mode - * @methodOf ng.$locationProvider + * @name $locationProvider#html5Mode * @description * @param {boolean=} mode Use HTML5 strategy if available. * @returns {*} current value if used as getter or itself (chaining) if used as setter @@ -569,8 +558,7 @@ function $LocationProvider(){ /** * @ngdoc event - * @name ng.$location#$locationChangeStart - * @eventOf ng.$location + * @name $location#$locationChangeStart * @eventType broadcast on root scope * @description * Broadcasted before a URL will change. This change can be prevented by calling @@ -585,8 +573,7 @@ function $LocationProvider(){ /** * @ngdoc event - * @name ng.$location#$locationChangeSuccess - * @eventOf ng.$location + * @name $location#$locationChangeSuccess * @eventType broadcast on root scope * @description * Broadcasted after a URL was changed. diff --git a/src/ng/log.js b/src/ng/log.js index 31e87a23..e228701b 100644 --- a/src/ng/log.js +++ b/src/ng/log.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc object - * @name ng.$log + * @ngdoc service + * @name $log * @requires $window * * @description @@ -37,8 +37,8 @@ */ /** - * @ngdoc object - * @name ng.$logProvider + * @ngdoc provider + * @name $logProvider * @description * Use the `$logProvider` to configure how the application logs messages */ @@ -48,8 +48,7 @@ function $LogProvider(){ /** * @ngdoc property - * @name ng.$logProvider#debugEnabled - * @methodOf ng.$logProvider + * @name $logProvider#debugEnabled * @description * @param {boolean=} flag enable or disable debug level messages * @returns {*} current value if used as getter or itself (chaining) if used as setter @@ -67,8 +66,7 @@ function $LogProvider(){ return { /** * @ngdoc method - * @name ng.$log#log - * @methodOf ng.$log + * @name $log#log * * @description * Write a log message @@ -77,8 +75,7 @@ function $LogProvider(){ /** * @ngdoc method - * @name ng.$log#info - * @methodOf ng.$log + * @name $log#info * * @description * Write an information message @@ -87,8 +84,7 @@ function $LogProvider(){ /** * @ngdoc method - * @name ng.$log#warn - * @methodOf ng.$log + * @name $log#warn * * @description * Write a warning message @@ -97,8 +93,7 @@ function $LogProvider(){ /** * @ngdoc method - * @name ng.$log#error - * @methodOf ng.$log + * @name $log#error * * @description * Write an error message @@ -107,8 +102,7 @@ function $LogProvider(){ /** * @ngdoc method - * @name ng.$log#debug - * @methodOf ng.$log + * @name $log#debug * * @description * Write a debug message diff --git a/src/ng/parse.js b/src/ng/parse.js index b5adf7e9..f84c8fa7 100644 --- a/src/ng/parse.js +++ b/src/ng/parse.js @@ -1083,9 +1083,9 @@ function getterFn(path, options, fullExp) { /////////////////////////////////// /** - * @ngdoc function - * @name ng.$parse - * @function + * @ngdoc service + * @name $parse + * @kind function * * @description * @@ -1124,8 +1124,8 @@ function getterFn(path, options, fullExp) { /** - * @ngdoc object - * @name ng.$parseProvider + * @ngdoc provider + * @name $parseProvider * @function * * @description @@ -1146,8 +1146,7 @@ function $ParseProvider() { * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future. * * @ngdoc method - * @name ng.$parseProvider#unwrapPromises - * @methodOf ng.$parseProvider + * @name $parseProvider#unwrapPromises * @description * * **This feature is deprecated, see deprecation notes below for more info** @@ -1201,8 +1200,7 @@ function $ParseProvider() { * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future. * * @ngdoc method - * @name ng.$parseProvider#logPromiseWarnings - * @methodOf ng.$parseProvider + * @name $parseProvider#logPromiseWarnings * @description * * Controls whether Angular should log a warning on any encounter of a promise in an expression. diff --git a/src/ng/q.js b/src/ng/q.js index d0807346..38a63f53 100644 --- a/src/ng/q.js +++ b/src/ng/q.js @@ -2,7 +2,7 @@ /** * @ngdoc service - * @name ng.$q + * @name $q * @requires $rootScope * * @description @@ -190,8 +190,7 @@ function qFactory(nextTick, exceptionHandler) { /** * @ngdoc - * @name ng.$q#defer - * @methodOf ng.$q + * @name $q#defer * @description * Creates a `Deferred` object which represents a task which will finish in the future. * @@ -346,8 +345,7 @@ function qFactory(nextTick, exceptionHandler) { /** * @ngdoc - * @name ng.$q#reject - * @methodOf ng.$q + * @name $q#reject * @description * Creates a promise that is resolved as rejected with the specified `reason`. This api should be * used to forward rejection in a chain of promises. If you are dealing with the last promise in @@ -405,8 +403,7 @@ function qFactory(nextTick, exceptionHandler) { /** * @ngdoc - * @name ng.$q#when - * @methodOf ng.$q + * @name $q#when * @description * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. * This is useful when you are dealing with an object that might or might not be a promise, or if @@ -476,8 +473,7 @@ function qFactory(nextTick, exceptionHandler) { /** * @ngdoc - * @name ng.$q#all - * @methodOf ng.$q + * @name $q#all * @description * Combines multiple promises into a single promise that is resolved when all of the input * promises are resolved. diff --git a/src/ng/rootElement.js b/src/ng/rootElement.js index 9385050e..09fb8ddb 100644 --- a/src/ng/rootElement.js +++ b/src/ng/rootElement.js @@ -1,14 +1,14 @@ 'use strict'; /** - * @ngdoc overview - * @name ng.$rootElement + * @ngdoc service + * @name $rootElement * * @description * The root element of Angular application. This is either the element where {@link * ng.directive:ngApp ngApp} was declared or the element passed into * {@link angular.bootstrap}. The element represent the root element of application. It is also the - * location where the applications {@link AUTO.$injector $injector} service gets + * location where the applications {@link auto.$injector $injector} service gets * published, it can be retrieved using `$rootElement.injector()`. */ diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js index c90d28a6..d5be52b0 100644 --- a/src/ng/rootScope.js +++ b/src/ng/rootScope.js @@ -27,17 +27,16 @@ /** - * @ngdoc object - * @name ng.$rootScopeProvider + * @ngdoc provider + * @name $rootScopeProvider * @description * * Provider for the $rootScope service. */ /** - * @ngdoc function - * @name ng.$rootScopeProvider#digestTtl - * @methodOf ng.$rootScopeProvider + * @ngdoc method + * @name $rootScopeProvider#digestTtl * @description * * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and @@ -58,8 +57,8 @@ /** - * @ngdoc object - * @name ng.$rootScope + * @ngdoc service + * @name $rootScope * @description * * Every application has a single root {@link ng.$rootScope.Scope scope}. @@ -84,12 +83,12 @@ function $RootScopeProvider(){ function( $injector, $exceptionHandler, $parse, $browser) { /** - * @ngdoc function - * @name ng.$rootScope.Scope + * @ngdoc type + * @name $rootScope.Scope * * @description * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the - * {@link AUTO.$injector $injector}. Child scopes are created using the + * {@link auto.$injector $injector}. Child scopes are created using the * {@link ng.$rootScope.Scope#methods_$new $new()} method. (Most scopes are created automatically when * compiled HTML template is executed.) * @@ -139,7 +138,7 @@ function $RootScopeProvider(){ /** * @ngdoc property - * @name ng.$rootScope.Scope#$id + * @name $rootScope.Scope#$id * @propertyOf ng.$rootScope.Scope * @returns {number} Unique scope ID (monotonically increasing alphanumeric sequence) useful for * debugging. @@ -149,9 +148,8 @@ function $RootScopeProvider(){ Scope.prototype = { constructor: Scope, /** - * @ngdoc function - * @name ng.$rootScope.Scope#$new - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$new * @function * * @description @@ -207,9 +205,8 @@ function $RootScopeProvider(){ }, /** - * @ngdoc function - * @name ng.$rootScope.Scope#$watch - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$watch * @function * * @description @@ -359,9 +356,8 @@ function $RootScopeProvider(){ /** - * @ngdoc function - * @name ng.$rootScope.Scope#$watchCollection - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$watchCollection * @function * * @description @@ -499,9 +495,8 @@ function $RootScopeProvider(){ }, /** - * @ngdoc function - * @name ng.$rootScope.Scope#$digest - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$digest * @function * * @description @@ -656,7 +651,7 @@ function $RootScopeProvider(){ /** * @ngdoc event - * @name ng.$rootScope.Scope#$destroy + * @name $rootScope.Scope#$destroy * @eventOf ng.$rootScope.Scope * @eventType broadcast on scope being destroyed * @@ -668,9 +663,8 @@ function $RootScopeProvider(){ */ /** - * @ngdoc function - * @name ng.$rootScope.Scope#$destroy - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$destroy * @function * * @description @@ -713,9 +707,8 @@ function $RootScopeProvider(){ }, /** - * @ngdoc function - * @name ng.$rootScope.Scope#$eval - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$eval * @function * * @description @@ -746,9 +739,8 @@ function $RootScopeProvider(){ }, /** - * @ngdoc function - * @name ng.$rootScope.Scope#$evalAsync - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$evalAsync * @function * * @description @@ -794,9 +786,8 @@ function $RootScopeProvider(){ }, /** - * @ngdoc function - * @name ng.$rootScope.Scope#$apply - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$apply * @function * * @description @@ -857,9 +848,8 @@ function $RootScopeProvider(){ }, /** - * @ngdoc function - * @name ng.$rootScope.Scope#$on - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$on * @function * * @description @@ -907,9 +897,8 @@ function $RootScopeProvider(){ /** - * @ngdoc function - * @name ng.$rootScope.Scope#$emit - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$emit * @function * * @description @@ -976,9 +965,8 @@ function $RootScopeProvider(){ /** - * @ngdoc function - * @name ng.$rootScope.Scope#$broadcast - * @methodOf ng.$rootScope.Scope + * @ngdoc method + * @name $rootScope.Scope#$broadcast * @function * * @description diff --git a/src/ng/sce.js b/src/ng/sce.js index a7d616a5..d52a3a16 100644 --- a/src/ng/sce.js +++ b/src/ng/sce.js @@ -64,7 +64,7 @@ function adjustMatchers(matchers) { /** * @ngdoc service - * @name ng.$sceDelegate + * @name $sceDelegate * @function * * @description @@ -90,8 +90,8 @@ function adjustMatchers(matchers) { */ /** - * @ngdoc object - * @name ng.$sceDelegateProvider + * @ngdoc provider + * @name $sceDelegateProvider * @description * * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate @@ -135,9 +135,8 @@ function $SceDelegateProvider() { resourceUrlBlacklist = []; /** - * @ngdoc function - * @name ng.sceDelegateProvider#resourceUrlWhitelist - * @methodOf ng.$sceDelegateProvider + * @ngdoc method + * @name sceDelegateProvider#resourceUrlWhitelist * @function * * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value @@ -165,9 +164,8 @@ function $SceDelegateProvider() { }; /** - * @ngdoc function - * @name ng.sceDelegateProvider#resourceUrlBlacklist - * @methodOf ng.$sceDelegateProvider + * @ngdoc method + * @name sceDelegateProvider#resourceUrlBlacklist * @function * * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value @@ -270,8 +268,7 @@ function $SceDelegateProvider() { /** * @ngdoc method - * @name ng.$sceDelegate#trustAs - * @methodOf ng.$sceDelegate + * @name $sceDelegate#trustAs * * @description * Returns an object that is trusted by angular for use in specified strict @@ -308,8 +305,7 @@ function $SceDelegateProvider() { /** * @ngdoc method - * @name ng.$sceDelegate#valueOf - * @methodOf ng.$sceDelegate + * @name $sceDelegate#valueOf * * @description * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#methods_trustAs @@ -335,8 +331,7 @@ function $SceDelegateProvider() { /** * @ngdoc method - * @name ng.$sceDelegate#getTrusted - * @methodOf ng.$sceDelegate + * @name $sceDelegate#getTrusted * * @description * Takes the result of a {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs`} call and @@ -382,8 +377,8 @@ function $SceDelegateProvider() { /** - * @ngdoc object - * @name ng.$sceProvider + * @ngdoc provider + * @name $sceProvider * @description * * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service. @@ -397,7 +392,7 @@ function $SceDelegateProvider() { /** * @ngdoc service - * @name ng.$sce + * @name $sce * @function * * @description @@ -667,9 +662,8 @@ function $SceProvider() { var enabled = true; /** - * @ngdoc function - * @name ng.sceProvider#enabled - * @methodOf ng.$sceProvider + * @ngdoc method + * @name sceProvider#enabled * @function * * @param {boolean=} value If provided, then enables/disables SCE. @@ -746,9 +740,8 @@ function $SceProvider() { var sce = copy(SCE_CONTEXTS); /** - * @ngdoc function - * @name ng.sce#isEnabled - * @methodOf ng.$sce + * @ngdoc method + * @name sce#isEnabled * @function * * @return {Boolean} true if SCE is enabled, false otherwise. If you want to set the value, you @@ -771,8 +764,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#parse - * @methodOf ng.$sce + * @name $sce#parse * * @description * Converts Angular {@link guide/expression expression} into a function. This is like {@link @@ -802,8 +794,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#trustAs - * @methodOf ng.$sce + * @name $sce#trustAs * * @description * Delegates to {@link ng.$sceDelegate#methods_trustAs `$sceDelegate.trustAs`}. As such, @@ -822,8 +813,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#trustAsHtml - * @methodOf ng.$sce + * @name $sce#trustAsHtml * * @description * Shorthand method. `$sce.trustAsHtml(value)` → @@ -838,8 +828,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#trustAsUrl - * @methodOf ng.$sce + * @name $sce#trustAsUrl * * @description * Shorthand method. `$sce.trustAsUrl(value)` → @@ -854,8 +843,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#trustAsResourceUrl - * @methodOf ng.$sce + * @name $sce#trustAsResourceUrl * * @description * Shorthand method. `$sce.trustAsResourceUrl(value)` → @@ -870,8 +858,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#trustAsJs - * @methodOf ng.$sce + * @name $sce#trustAsJs * * @description * Shorthand method. `$sce.trustAsJs(value)` → @@ -886,8 +873,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#getTrusted - * @methodOf ng.$sce + * @name $sce#getTrusted * * @description * Delegates to {@link ng.$sceDelegate#methods_getTrusted `$sceDelegate.getTrusted`}. As such, @@ -905,8 +891,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#getTrustedHtml - * @methodOf ng.$sce + * @name $sce#getTrustedHtml * * @description * Shorthand method. `$sce.getTrustedHtml(value)` → @@ -918,8 +903,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#getTrustedCss - * @methodOf ng.$sce + * @name $sce#getTrustedCss * * @description * Shorthand method. `$sce.getTrustedCss(value)` → @@ -931,8 +915,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#getTrustedUrl - * @methodOf ng.$sce + * @name $sce#getTrustedUrl * * @description * Shorthand method. `$sce.getTrustedUrl(value)` → @@ -944,8 +927,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#getTrustedResourceUrl - * @methodOf ng.$sce + * @name $sce#getTrustedResourceUrl * * @description * Shorthand method. `$sce.getTrustedResourceUrl(value)` → @@ -957,8 +939,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#getTrustedJs - * @methodOf ng.$sce + * @name $sce#getTrustedJs * * @description * Shorthand method. `$sce.getTrustedJs(value)` → @@ -970,8 +951,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#parseAsHtml - * @methodOf ng.$sce + * @name $sce#parseAsHtml * * @description * Shorthand method. `$sce.parseAsHtml(expression string)` → @@ -988,8 +968,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#parseAsCss - * @methodOf ng.$sce + * @name $sce#parseAsCss * * @description * Shorthand method. `$sce.parseAsCss(value)` → @@ -1006,8 +985,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#parseAsUrl - * @methodOf ng.$sce + * @name $sce#parseAsUrl * * @description * Shorthand method. `$sce.parseAsUrl(value)` → @@ -1024,8 +1002,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#parseAsResourceUrl - * @methodOf ng.$sce + * @name $sce#parseAsResourceUrl * * @description * Shorthand method. `$sce.parseAsResourceUrl(value)` → @@ -1042,8 +1019,7 @@ function $SceProvider() { /** * @ngdoc method - * @name ng.$sce#parseAsJs - * @methodOf ng.$sce + * @name $sce#parseAsJs * * @description * Shorthand method. `$sce.parseAsJs(value)` → diff --git a/src/ng/sniffer.js b/src/ng/sniffer.js index 52acc870..c225ab8c 100644 --- a/src/ng/sniffer.js +++ b/src/ng/sniffer.js @@ -3,7 +3,7 @@ /** * !!! This is an undocumented "private" service !!! * - * @name ng.$sniffer + * @name $sniffer * @requires $window * @requires $document * diff --git a/src/ng/timeout.js b/src/ng/timeout.js index 511a0a05..ff87c93b 100644 --- a/src/ng/timeout.js +++ b/src/ng/timeout.js @@ -8,8 +8,8 @@ function $TimeoutProvider() { /** - * @ngdoc function - * @name ng.$timeout + * @ngdoc service + * @name $timeout * @requires $browser * * @description @@ -61,9 +61,8 @@ function $TimeoutProvider() { /** - * @ngdoc function - * @name ng.$timeout#cancel - * @methodOf ng.$timeout + * @ngdoc method + * @name $timeout#cancel * * @description * Cancels a task associated with the `promise`. As a result of this, the promise will be diff --git a/src/ng/window.js b/src/ng/window.js index 4f0717af..94f8b884 100644 --- a/src/ng/window.js +++ b/src/ng/window.js @@ -1,8 +1,8 @@ 'use strict'; /** - * @ngdoc object - * @name ng.$window + * @ngdoc service + * @name $window * * @description * A reference to the browser's `window` object. While `window` diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js index 0ecb6515..c257921b 100644 --- a/src/ngAnimate/animate.js +++ b/src/ngAnimate/animate.js @@ -2,7 +2,7 @@ /* jshint maxlen: false */ /** - * @ngdoc overview + * @ngdoc module * @name ngAnimate * @description * @@ -235,8 +235,8 @@ angular.module('ngAnimate', ['ng']) /** - * @ngdoc object - * @name ngAnimate.$animateProvider + * @ngdoc provider + * @name $animateProvider * @description * * The `$animateProvider` allows developers to register JavaScript animation event handlers directly inside of a module. @@ -367,8 +367,8 @@ angular.module('ngAnimate', ['ng']) } /** - * @ngdoc object - * @name ngAnimate.$animate + * @ngdoc service + * @name $animate * @function * * @description @@ -387,9 +387,8 @@ angular.module('ngAnimate', ['ng']) */ return { /** - * @ngdoc function - * @name ngAnimate.$animate#enter - * @methodOf ngAnimate.$animate + * @ngdoc method + * @name $animate#enter * @function * * @description @@ -426,9 +425,8 @@ angular.module('ngAnimate', ['ng']) }, /** - * @ngdoc function - * @name ngAnimate.$animate#leave - * @methodOf ngAnimate.$animate + * @ngdoc method + * @name $animate#leave * @function * * @description @@ -465,9 +463,8 @@ angular.module('ngAnimate', ['ng']) }, /** - * @ngdoc function - * @name ngAnimate.$animate#move - * @methodOf ngAnimate.$animate + * @ngdoc method + * @name $animate#move * @function * * @description @@ -506,9 +503,8 @@ angular.module('ngAnimate', ['ng']) }, /** - * @ngdoc function - * @name ngAnimate.$animate#addClass - * @methodOf ngAnimate.$animate + * @ngdoc method + * @name $animate#addClass * * @description * Triggers a custom animation event based off the className variable and then attaches the className value to the element as a CSS class. @@ -543,9 +539,8 @@ angular.module('ngAnimate', ['ng']) }, /** - * @ngdoc function - * @name ngAnimate.$animate#removeClass - * @methodOf ngAnimate.$animate + * @ngdoc method + * @name $animate#removeClass * * @description * Triggers a custom animation event based off the className variable and then removes the CSS class provided by the className value @@ -602,9 +597,8 @@ angular.module('ngAnimate', ['ng']) }, /** - * @ngdoc function - * @name ngAnimate.$animate#enabled - * @methodOf ngAnimate.$animate + * @ngdoc method + * @name $animate#enabled * @function * * @param {boolean=} value If provided then set the animation on or off. diff --git a/src/ngCookies/cookies.js b/src/ngCookies/cookies.js index 94964bf8..ffa124c0 100644 --- a/src/ngCookies/cookies.js +++ b/src/ngCookies/cookies.js @@ -1,7 +1,7 @@ 'use strict'; /** - * @ngdoc overview + * @ngdoc module * @name ngCookies * @description * @@ -20,8 +20,8 @@ angular.module('ngCookies', ['ng']). /** - * @ngdoc object - * @name ngCookies.$cookies + * @ngdoc service + * @name $cookies * @requires $browser * * @description @@ -129,8 +129,8 @@ angular.module('ngCookies', ['ng']). /** - * @ngdoc object - * @name ngCookies.$cookieStore + * @ngdoc service + * @name $cookieStore * @requires $cookies * * @description @@ -147,8 +147,7 @@ angular.module('ngCookies', ['ng']). return { /** * @ngdoc method - * @name ngCookies.$cookieStore#get - * @methodOf ngCookies.$cookieStore + * @name $cookieStore#get * * @description * Returns the value of given cookie key @@ -163,8 +162,7 @@ angular.module('ngCookies', ['ng']). /** * @ngdoc method - * @name ngCookies.$cookieStore#put - * @methodOf ngCookies.$cookieStore + * @name $cookieStore#put * * @description * Sets a value for given cookie key @@ -178,8 +176,7 @@ angular.module('ngCookies', ['ng']). /** * @ngdoc method - * @name ngCookies.$cookieStore#remove - * @methodOf ngCookies.$cookieStore + * @name $cookieStore#remove * * @description * Remove given cookie diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index ba79fc88..1c276f29 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -1,7 +1,7 @@ 'use strict'; /** - * @ngdoc overview + * @ngdoc object * @name angular.mock * @description * @@ -12,7 +12,7 @@ angular.mock = {}; /** * ! This is a private undocumented service ! * - * @name ngMock.$browser + * @name $browser * * @description * This service is a mock implementation of {@link ng.$browser}. It provides fake @@ -70,8 +70,7 @@ angular.mock.$Browser = function() { /** - * @name ngMock.$browser#defer.now - * @propertyOf ngMock.$browser + * @name $browser#defer.now * * @description * Current milliseconds mock time. @@ -96,8 +95,7 @@ angular.mock.$Browser = function() { /** - * @name ngMock.$browser#defer.flush - * @methodOf ngMock.$browser + * @name $browser#defer.flush * * @description * Flushes all pending requests and executes the defer callbacks. @@ -128,8 +126,7 @@ angular.mock.$Browser = function() { angular.mock.$Browser.prototype = { /** - * @name ngMock.$browser#poll - * @methodOf ngMock.$browser + * @name $browser#poll * * @description * run all fns in pollFns @@ -180,8 +177,8 @@ angular.mock.$Browser.prototype = { /** - * @ngdoc object - * @name ngMock.$exceptionHandlerProvider + * @ngdoc provider + * @name $exceptionHandlerProvider * * @description * Configures the mock implementation of {@link ng.$exceptionHandler} to rethrow or to log errors @@ -189,8 +186,8 @@ angular.mock.$Browser.prototype = { */ /** - * @ngdoc object - * @name ngMock.$exceptionHandler + * @ngdoc service + * @name $exceptionHandler * * @description * Mock implementation of {@link ng.$exceptionHandler} that rethrows or logs errors passed @@ -227,8 +224,7 @@ angular.mock.$ExceptionHandlerProvider = function() { /** * @ngdoc method - * @name ngMock.$exceptionHandlerProvider#mode - * @methodOf ngMock.$exceptionHandlerProvider + * @name $exceptionHandlerProvider#mode * * @description * Sets the logging mode. @@ -278,7 +274,7 @@ angular.mock.$ExceptionHandlerProvider = function() { /** * @ngdoc service - * @name ngMock.$log + * @name $log * * @description * Mock implementation of {@link ng.$log} that gathers all logged messages in arrays @@ -317,8 +313,7 @@ angular.mock.$LogProvider = function() { /** * @ngdoc method - * @name ngMock.$log#reset - * @methodOf ngMock.$log + * @name $log#reset * * @description * Reset all of the logging arrays to empty. @@ -326,8 +321,7 @@ angular.mock.$LogProvider = function() { $log.reset = function () { /** * @ngdoc property - * @name ngMock.$log#log.logs - * @propertyOf ngMock.$log + * @name $log#log.logs * * @description * Array of messages logged using {@link ngMock.$log#log}. @@ -341,8 +335,7 @@ angular.mock.$LogProvider = function() { $log.log.logs = []; /** * @ngdoc property - * @name ngMock.$log#info.logs - * @propertyOf ngMock.$log + * @name $log#info.logs * * @description * Array of messages logged using {@link ngMock.$log#info}. @@ -356,8 +349,7 @@ angular.mock.$LogProvider = function() { $log.info.logs = []; /** * @ngdoc property - * @name ngMock.$log#warn.logs - * @propertyOf ngMock.$log + * @name $log#warn.logs * * @description * Array of messages logged using {@link ngMock.$log#warn}. @@ -371,8 +363,7 @@ angular.mock.$LogProvider = function() { $log.warn.logs = []; /** * @ngdoc property - * @name ngMock.$log#error.logs - * @propertyOf ngMock.$log + * @name $log#error.logs * * @description * Array of messages logged using {@link ngMock.$log#error}. @@ -386,8 +377,7 @@ angular.mock.$LogProvider = function() { $log.error.logs = []; /** * @ngdoc property - * @name ngMock.$log#debug.logs - * @propertyOf ngMock.$log + * @name $log#debug.logs * * @description * Array of messages logged using {@link ngMock.$log#debug}. @@ -403,8 +393,7 @@ angular.mock.$LogProvider = function() { /** * @ngdoc method - * @name ngMock.$log#assertEmpty - * @methodOf ngMock.$log + * @name $log#assertEmpty * * @description * Assert that the all of the logging methods have no logged messages. If messages present, an @@ -436,7 +425,7 @@ angular.mock.$LogProvider = function() { /** * @ngdoc service - * @name ngMock.$interval + * @name $interval * * @description * Mock implementation of the $interval service. @@ -522,8 +511,7 @@ angular.mock.$IntervalProvider = function() { /** * @ngdoc method - * @name ngMock.$interval#flush - * @methodOf ngMock.$interval + * @name $interval#flush * @description * * Runs interval tasks scheduled to be run in the next `millis` milliseconds. @@ -594,7 +582,7 @@ function padNumber(num, digits, trim) { /** - * @ngdoc object + * @ngdoc type * @name angular.mock.TzDate * @description * @@ -871,8 +859,8 @@ angular.mock.dump = function(object) { }; /** - * @ngdoc object - * @name ngMock.$httpBackend + * @ngdoc service + * @name $httpBackend * @description * Fake HTTP backend implementation suitable for unit testing applications that use the * {@link ng.$http $http service}. @@ -1174,8 +1162,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#when - * @methodOf ngMock.$httpBackend + * @name $httpBackend#when * @description * Creates a new backend definition. * @@ -1214,8 +1201,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#whenGET - * @methodOf ngMock.$httpBackend + * @name $httpBackend#whenGET * @description * Creates a new backend definition for GET requests. For more info see `when()`. * @@ -1227,8 +1213,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#whenHEAD - * @methodOf ngMock.$httpBackend + * @name $httpBackend#whenHEAD * @description * Creates a new backend definition for HEAD requests. For more info see `when()`. * @@ -1240,8 +1225,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#whenDELETE - * @methodOf ngMock.$httpBackend + * @name $httpBackend#whenDELETE * @description * Creates a new backend definition for DELETE requests. For more info see `when()`. * @@ -1253,8 +1237,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#whenPOST - * @methodOf ngMock.$httpBackend + * @name $httpBackend#whenPOST * @description * Creates a new backend definition for POST requests. For more info see `when()`. * @@ -1268,8 +1251,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#whenPUT - * @methodOf ngMock.$httpBackend + * @name $httpBackend#whenPUT * @description * Creates a new backend definition for PUT requests. For more info see `when()`. * @@ -1283,8 +1265,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#whenJSONP - * @methodOf ngMock.$httpBackend + * @name $httpBackend#whenJSONP * @description * Creates a new backend definition for JSONP requests. For more info see `when()`. * @@ -1297,8 +1278,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#expect - * @methodOf ngMock.$httpBackend + * @name $httpBackend#expect * @description * Creates a new request expectation. * @@ -1331,8 +1311,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#expectGET - * @methodOf ngMock.$httpBackend + * @name $httpBackend#expectGET * @description * Creates a new request expectation for GET requests. For more info see `expect()`. * @@ -1344,8 +1323,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#expectHEAD - * @methodOf ngMock.$httpBackend + * @name $httpBackend#expectHEAD * @description * Creates a new request expectation for HEAD requests. For more info see `expect()`. * @@ -1357,8 +1335,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#expectDELETE - * @methodOf ngMock.$httpBackend + * @name $httpBackend#expectDELETE * @description * Creates a new request expectation for DELETE requests. For more info see `expect()`. * @@ -1370,8 +1347,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#expectPOST - * @methodOf ngMock.$httpBackend + * @name $httpBackend#expectPOST * @description * Creates a new request expectation for POST requests. For more info see `expect()`. * @@ -1386,8 +1362,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#expectPUT - * @methodOf ngMock.$httpBackend + * @name $httpBackend#expectPUT * @description * Creates a new request expectation for PUT requests. For more info see `expect()`. * @@ -1402,8 +1377,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#expectPATCH - * @methodOf ngMock.$httpBackend + * @name $httpBackend#expectPATCH * @description * Creates a new request expectation for PATCH requests. For more info see `expect()`. * @@ -1418,8 +1392,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#expectJSONP - * @methodOf ngMock.$httpBackend + * @name $httpBackend#expectJSONP * @description * Creates a new request expectation for JSONP requests. For more info see `expect()`. * @@ -1432,8 +1405,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#flush - * @methodOf ngMock.$httpBackend + * @name $httpBackend#flush * @description * Flushes all pending requests using the trained responses. * @@ -1461,8 +1433,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#verifyNoOutstandingExpectation - * @methodOf ngMock.$httpBackend + * @name $httpBackend#verifyNoOutstandingExpectation * @description * Verifies that all of the requests defined via the `expect` api were made. If any of the * requests were not made, verifyNoOutstandingExpectation throws an exception. @@ -1484,8 +1455,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#verifyNoOutstandingRequest - * @methodOf ngMock.$httpBackend + * @name $httpBackend#verifyNoOutstandingRequest * @description * Verifies that there are no outstanding requests that need to be flushed. * @@ -1505,8 +1475,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { /** * @ngdoc method - * @name ngMock.$httpBackend#resetExpectations - * @methodOf ngMock.$httpBackend + * @name $httpBackend#resetExpectations * @description * Resets all request expectations, but preserves all backend definitions. Typically, you would * call resetExpectations during a multiple-phase test when you want to reuse the same instance of @@ -1629,8 +1598,8 @@ function MockXhr() { /** - * @ngdoc function - * @name ngMock.$timeout + * @ngdoc service + * @name $timeout * @description * * This service is just a simple decorator for {@link ng.$timeout $timeout} service @@ -1641,8 +1610,7 @@ angular.mock.$TimeoutDecorator = function($delegate, $browser) { /** * @ngdoc method - * @name ngMock.$timeout#flush - * @methodOf ngMock.$timeout + * @name $timeout#flush * @description * * Flushes the queue of pending tasks. @@ -1655,8 +1623,7 @@ angular.mock.$TimeoutDecorator = function($delegate, $browser) { /** * @ngdoc method - * @name ngMock.$timeout#verifyNoPendingTasks - * @methodOf ngMock.$timeout + * @name $timeout#verifyNoPendingTasks * @description * * Verifies that there are no pending tasks that need to be flushed. @@ -1690,7 +1657,7 @@ angular.mock.$RootElementProvider = function() { }; /** - * @ngdoc overview + * @ngdoc module * @name ngMock * @description * @@ -1717,8 +1684,9 @@ angular.module('ngMock', ['ng']).provider({ }]); /** - * @ngdoc overview + * @ngdoc module * @name ngMockE2E + * @module ngMockE2E * @description * * The `ngMockE2E` is an angular module which contains mocks suitable for end-to-end testing. @@ -1730,8 +1698,9 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { }]); /** - * @ngdoc object - * @name ngMockE2E.$httpBackend + * @ngdoc service + * @name $httpBackend + * @module ngMockE2E * @description * Fake HTTP backend implementation suitable for end-to-end testing or backend-less development of * applications that use the {@link ng.$http $http service}. @@ -1779,8 +1748,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { /** * @ngdoc method - * @name ngMockE2E.$httpBackend#when - * @methodOf ngMockE2E.$httpBackend + * @name $httpBackend#when + * @module ngMockE2E * @description * Creates a new backend definition. * @@ -1804,8 +1773,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { /** * @ngdoc method - * @name ngMockE2E.$httpBackend#whenGET - * @methodOf ngMockE2E.$httpBackend + * @name $httpBackend#whenGET + * @module ngMockE2E * @description * Creates a new backend definition for GET requests. For more info see `when()`. * @@ -1817,8 +1786,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { /** * @ngdoc method - * @name ngMockE2E.$httpBackend#whenHEAD - * @methodOf ngMockE2E.$httpBackend + * @name $httpBackend#whenHEAD + * @module ngMockE2E * @description * Creates a new backend definition for HEAD requests. For more info see `when()`. * @@ -1830,8 +1799,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { /** * @ngdoc method - * @name ngMockE2E.$httpBackend#whenDELETE - * @methodOf ngMockE2E.$httpBackend + * @name $httpBackend#whenDELETE + * @module ngMockE2E * @description * Creates a new backend definition for DELETE requests. For more info see `when()`. * @@ -1843,8 +1812,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { /** * @ngdoc method - * @name ngMockE2E.$httpBackend#whenPOST - * @methodOf ngMockE2E.$httpBackend + * @name $httpBackend#whenPOST + * @module ngMockE2E * @description * Creates a new backend definition for POST requests. For more info see `when()`. * @@ -1857,8 +1826,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { /** * @ngdoc method - * @name ngMockE2E.$httpBackend#whenPUT - * @methodOf ngMockE2E.$httpBackend + * @name $httpBackend#whenPUT + * @module ngMockE2E * @description * Creates a new backend definition for PUT requests. For more info see `when()`. * @@ -1871,8 +1840,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { /** * @ngdoc method - * @name ngMockE2E.$httpBackend#whenPATCH - * @methodOf ngMockE2E.$httpBackend + * @name $httpBackend#whenPATCH + * @module ngMockE2E * @description * Creates a new backend definition for PATCH requests. For more info see `when()`. * @@ -1885,8 +1854,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { /** * @ngdoc method - * @name ngMockE2E.$httpBackend#whenJSONP - * @methodOf ngMockE2E.$httpBackend + * @name $httpBackend#whenJSONP + * @module ngMockE2E * @description * Creates a new backend definition for JSONP requests. For more info see `when()`. * @@ -2003,7 +1972,7 @@ if(window.jasmine || window.mocha) { * *NOTE*: This function is also published on window for easy access.<br> * * The inject function wraps a function into an injectable function. The inject() creates new - * instance of {@link AUTO.$injector $injector} per test, which is then used for + * instance of {@link auto.$injector $injector} per test, which is then used for * resolving references. * * diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js index 1ab31bf5..a75aab61 100644 --- a/src/ngResource/resource.js +++ b/src/ngResource/resource.js @@ -44,7 +44,7 @@ function shallowClearAndCopy(src, dst) { } /** - * @ngdoc overview + * @ngdoc module * @name ngResource * @description * @@ -61,8 +61,8 @@ function shallowClearAndCopy(src, dst) { */ /** - * @ngdoc object - * @name ngResource.$resource + * @ngdoc service + * @name $resource * @requires $http * * @description diff --git a/src/ngRoute/directive/ngView.js b/src/ngRoute/directive/ngView.js index a88d205d..f61fb121 100644 --- a/src/ngRoute/directive/ngView.js +++ b/src/ngRoute/directive/ngView.js @@ -6,7 +6,7 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory); /** * @ngdoc directive - * @name ngRoute.directive:ngView + * @name ngView * @restrict ECA * * @description @@ -172,8 +172,7 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory); /** * @ngdoc event - * @name ngRoute.directive:ngView#$viewContentLoaded - * @eventOf ngRoute.directive:ngView + * @name ngView#$viewContentLoaded * @eventType emit on the current ngView scope * @description * Emitted every time the ngView content is reloaded. diff --git a/src/ngRoute/route.js b/src/ngRoute/route.js index 51404fbc..c313d217 100644 --- a/src/ngRoute/route.js +++ b/src/ngRoute/route.js @@ -1,7 +1,7 @@ 'use strict'; /** - * @ngdoc overview + * @ngdoc module * @name ngRoute * @description * @@ -21,8 +21,8 @@ var ngRouteModule = angular.module('ngRoute', ['ng']). provider('$route', $RouteProvider); /** - * @ngdoc object - * @name ngRoute.$routeProvider + * @ngdoc provider + * @name $routeProvider * @function * * @description @@ -44,8 +44,7 @@ function $RouteProvider(){ /** * @ngdoc method - * @name ngRoute.$routeProvider#when - * @methodOf ngRoute.$routeProvider + * @name $routeProvider#when * * @param {string} path Route path (matched against `$location.path`). If `$location.path` * contains redundant trailing slash or is missing one, the route will still match and the @@ -107,7 +106,7 @@ function $RouteProvider(){ * * - `key` – `{string}`: a name of a dependency to be injected into the controller. * - `factory` - `{string|function}`: If `string` then it is an alias for a service. - * Otherwise if function, then it is {@link api/AUTO.$injector#invoke injected} + * Otherwise if function, then it is {@link api/auto.$injector#invoke injected} * and the return value is treated as the dependency. If the result is a promise, it is * resolved before its value is injected into the controller. Be aware that * `ngRoute.$routeParams` will still refer to the previous route within these resolve @@ -207,8 +206,7 @@ function $RouteProvider(){ /** * @ngdoc method - * @name ngRoute.$routeProvider#otherwise - * @methodOf ngRoute.$routeProvider + * @name $routeProvider#otherwise * * @description * Sets route definition that will be used on route change when no other route definition @@ -234,8 +232,8 @@ function $RouteProvider(){ function($rootScope, $location, $routeParams, $q, $injector, $http, $templateCache, $sce) { /** - * @ngdoc object - * @name ngRoute.$route + * @ngdoc service + * @name $route * @requires $location * @requires $routeParams * @@ -365,8 +363,7 @@ function $RouteProvider(){ /** * @ngdoc event - * @name ngRoute.$route#$routeChangeStart - * @eventOf ngRoute.$route + * @name $route#$routeChangeStart * @eventType broadcast on root scope * @description * Broadcasted before a route change. At this point the route services starts @@ -382,8 +379,7 @@ function $RouteProvider(){ /** * @ngdoc event - * @name ngRoute.$route#$routeChangeSuccess - * @eventOf ngRoute.$route + * @name $route#$routeChangeSuccess * @eventType broadcast on root scope * @description * Broadcasted after a route dependencies are resolved. @@ -398,8 +394,7 @@ function $RouteProvider(){ /** * @ngdoc event - * @name ngRoute.$route#$routeChangeError - * @eventOf ngRoute.$route + * @name $route#$routeChangeError * @eventType broadcast on root scope * @description * Broadcasted if any of the resolve promises are rejected. @@ -412,8 +407,7 @@ function $RouteProvider(){ /** * @ngdoc event - * @name ngRoute.$route#$routeUpdate - * @eventOf ngRoute.$route + * @name $route#$routeUpdate * @eventType broadcast on root scope * @description * @@ -427,8 +421,7 @@ function $RouteProvider(){ /** * @ngdoc method - * @name ngRoute.$route#reload - * @methodOf ngRoute.$route + * @name $route#reload * * @description * Causes `$route` service to reload the current route even if diff --git a/src/ngRoute/routeParams.js b/src/ngRoute/routeParams.js index e7b9da7a..977a26bc 100644 --- a/src/ngRoute/routeParams.js +++ b/src/ngRoute/routeParams.js @@ -4,8 +4,8 @@ ngRouteModule.provider('$routeParams', $RouteParamsProvider); /** - * @ngdoc object - * @name ngRoute.$routeParams + * @ngdoc service + * @name $routeParams * @requires $route * * @description diff --git a/src/ngSanitize/filter/linky.js b/src/ngSanitize/filter/linky.js index da96ad2f..43019f33 100644 --- a/src/ngSanitize/filter/linky.js +++ b/src/ngSanitize/filter/linky.js @@ -4,7 +4,7 @@ /** * @ngdoc filter - * @name ngSanitize.filter:linky + * @name linky * @function * * @description diff --git a/src/ngSanitize/sanitize.js b/src/ngSanitize/sanitize.js index 1b6cb94e..6b1e99ea 100644 --- a/src/ngSanitize/sanitize.js +++ b/src/ngSanitize/sanitize.js @@ -3,7 +3,7 @@ var $sanitizeMinErr = angular.$$minErr('$sanitize'); /** - * @ngdoc overview + * @ngdoc module * @name ngSanitize * @description * @@ -37,7 +37,7 @@ var $sanitizeMinErr = angular.$$minErr('$sanitize'); /** * @ngdoc service - * @name ngSanitize.$sanitize + * @name $sanitize * @function * * @description diff --git a/src/ngTouch/directive/ngClick.js b/src/ngTouch/directive/ngClick.js index 10ae3efc..c2eaac5c 100644 --- a/src/ngTouch/directive/ngClick.js +++ b/src/ngTouch/directive/ngClick.js @@ -4,7 +4,7 @@ /** * @ngdoc directive - * @name ngTouch.directive:ngClick + * @name ngClick * * @description * A more powerful replacement for the default ngClick designed to be used on touchscreen diff --git a/src/ngTouch/directive/ngSwipe.js b/src/ngTouch/directive/ngSwipe.js index bda37fe9..7f60d228 100644 --- a/src/ngTouch/directive/ngSwipe.js +++ b/src/ngTouch/directive/ngSwipe.js @@ -4,7 +4,7 @@ /** * @ngdoc directive - * @name ngTouch.directive:ngSwipeLeft + * @name ngSwipeLeft * * @description * Specify custom behavior when an element is swiped to the left on a touchscreen device. @@ -34,7 +34,7 @@ /** * @ngdoc directive - * @name ngTouch.directive:ngSwipeRight + * @name ngSwipeRight * * @description * Specify custom behavior when an element is swiped to the right on a touchscreen device. diff --git a/src/ngTouch/swipe.js b/src/ngTouch/swipe.js index afdf4384..ea79a96c 100644 --- a/src/ngTouch/swipe.js +++ b/src/ngTouch/swipe.js @@ -3,8 +3,8 @@ /* global ngTouch: false */ /** - * @ngdoc object - * @name ngTouch.$swipe + * @ngdoc service + * @name $swipe * * @description * The `$swipe` service is a service that abstracts the messier details of hold-and-drag swipe @@ -41,8 +41,7 @@ ngTouch.factory('$swipe', [function() { return { /** * @ngdoc method - * @name ngTouch.$swipe#bind - * @methodOf ngTouch.$swipe + * @name $swipe#bind * * @description * The main method of `$swipe`. It takes an element to be watched for swipe motions, and an diff --git a/src/ngTouch/touch.js b/src/ngTouch/touch.js index f885307d..052cbdd3 100644 --- a/src/ngTouch/touch.js +++ b/src/ngTouch/touch.js @@ -1,7 +1,7 @@ 'use strict'; /** - * @ngdoc overview + * @ngdoc module * @name ngTouch * @description * |