diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/AngularPublic.js | 6 | ||||
| -rw-r--r-- | src/Injector.js | 20 | ||||
| -rw-r--r-- | src/angular-mocks.js | 2 | ||||
| -rw-r--r-- | src/loader.js | 6 | 
4 files changed, 17 insertions, 17 deletions
| diff --git a/src/AngularPublic.js b/src/AngularPublic.js index 5bc59653..d0a0e045 100644 --- a/src/AngularPublic.js +++ b/src/AngularPublic.js @@ -55,12 +55,12 @@ function publishExternalAPI(angular){    try {      angularModule('ngLocale');    } catch (e) { -    angularModule('ngLocale', []).service('$locale', $LocaleProvider); +    angularModule('ngLocale', []).provider('$locale', $LocaleProvider);    }    angularModule('ng', ['ngLocale'], ['$provide',      function ngModule($provide) { -      $provide.service('$compile', $CompileProvider). +      $provide.provider('$compile', $CompileProvider).          directive({              a: htmlAnchorDirective,              input: inputDirective, @@ -105,7 +105,7 @@ function publishExternalAPI(angular){          }).          directive(ngAttributeAliasDirectives).          directive(ngEventDirectives); -      $provide.service({ +      $provide.provider({          $anchorScroll: $AnchorScrollProvider,          $browser: $BrowserProvider,          $cacheFactory: $CacheFactoryProvider, diff --git a/src/Injector.js b/src/Injector.js index a05a12ea..dc37a97c 100644 --- a/src/Injector.js +++ b/src/Injector.js @@ -183,7 +183,7 @@ function inferInjectionArgs(fn) {   *   describe('Greeter', function(){   *   *     beforeEach(module(function($provide) { - *       $provide.service('greet', GreetProvider); + *       $provide.provider('greet', GreetProvider);   *     });   *   *     it('should greet', inject(function(greet) { @@ -205,7 +205,7 @@ function inferInjectionArgs(fn) {  /**   * @ngdoc method - * @name angular.module.AUTO.$provide#service + * @name angular.module.AUTO.$provide#provider   * @methodOf angular.module.AUTO.$provide   * @description   * @@ -232,7 +232,7 @@ function inferInjectionArgs(fn) {   *   * @param {string} name The name of the instance. NOTE: the provider will be available under `name + 'Provider'` key.   * @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand for - * `$provide.service(name, {$get:$getFn})`. + * `$provide.provider(name, {$get: $getFn})`.   * @returns {Object} registered provider instance   */ @@ -294,7 +294,7 @@ function createInjector(modulesToLoad) {        loadedModules = new HashMap(),        providerCache = {          $provide: { -            service: supportObject(service), +            provider: supportObject(provider),              factory: supportObject(factory),              value: supportObject(value),              constant: supportObject(constant), @@ -330,17 +330,17 @@ function createInjector(modulesToLoad) {      }    } -  function service(name, provider) { -    if (isFunction(provider)){ -      provider = providerInjector.instantiate(provider); +  function provider(name, provider_) { +    if (isFunction(provider_)) { +      provider_ = providerInjector.instantiate(provider_);      } -    if (!provider.$get) { +    if (!provider_.$get) {        throw Error('Provider ' + name + ' must define $get factory method.');      } -    return providerCache[name + providerSuffix] = provider; +    return providerCache[name + providerSuffix] = provider_;    } -  function factory(name, factoryFn) { return service(name, { $get:factoryFn }); } +  function factory(name, factoryFn) { return provider(name, { $get: factoryFn }); }    function value(name, value) { return factory(name, valueFn(value)); } diff --git a/src/angular-mocks.js b/src/angular-mocks.js index 93136698..306ca77b 100644 --- a/src/angular-mocks.js +++ b/src/angular-mocks.js @@ -1271,7 +1271,7 @@ function MockXhr() {   * The `ngMock` is an angular module which is used with `ng` module and adds unit-test configuration as well as useful   * mocks to the {@link angular.module.AUTO.$injector $injector}.   */ -angular.module('ngMock', ['ng']).service({ +angular.module('ngMock', ['ng']).provider({    $browser: angular.mock.$BrowserProvider,    $exceptionHandler: angular.mock.$ExceptionHandlerProvider,    $log: angular.mock.$LogProvider, diff --git a/src/loader.js b/src/loader.js index 315c5c42..3e5bffef 100644 --- a/src/loader.js +++ b/src/loader.js @@ -109,14 +109,14 @@ function setupModuleLoader(window) {            /**             * @ngdoc method -           * @name angular.Module#service +           * @name angular.Module#provider             * @methodOf angular.Module             * @param {string} name service name             * @param {Function} providerType Construction function for creating new instance of the service.             * @description -           * See {@link angular.module.AUTO.$provide#service $provide.service()}. +           * See {@link angular.module.AUTO.$provide#provider $provide.provider()}.             */ -          service: invokeLater('$provide', 'service'), +          provider: invokeLater('$provide', 'provider'),            /**             * @ngdoc method | 
