Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 00d4427

Browse files
vojtajinavojtajina
committed
refactor($provide) Rename service -> provider
It registers a provider class, so this makes more sense. Breaks Rename $provide.service -> $provide.provider
1 parent e0c9551 commit 00d4427

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

‎docs/src/templates/doc_widgets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ angular.module('ngdocs.directives', [], function($compileProvider) {
8686
var modules = [
8787
function($provide) {
8888
$provide.value('$browser', $browser);
89-
$provide.service('$location', function() {
89+
$provide.provider('$location', function() {
9090
this.$get = function() {
9191
return $location;
9292
};

‎src/AngularPublic.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ function publishExternalAPI(angular){
5555
try {
5656
angularModule('ngLocale');
5757
} catch (e) {
58-
angularModule('ngLocale', []).service('$locale', $LocaleProvider);
58+
angularModule('ngLocale', []).provider('$locale', $LocaleProvider);
5959
}
6060

6161
angularModule('ng', ['ngLocale'], ['$provide',
6262
function ngModule($provide) {
63-
$provide.service('$compile', $CompileProvider).
63+
$provide.provider('$compile', $CompileProvider).
6464
directive({
6565
a: htmlAnchorDirective,
6666
input: inputDirective,
@@ -105,7 +105,7 @@ function publishExternalAPI(angular){
105105
}).
106106
directive(ngAttributeAliasDirectives).
107107
directive(ngEventDirectives);
108-
$provide.service({
108+
$provide.provider({
109109
$anchorScroll: $AnchorScrollProvider,
110110
$browser: $BrowserProvider,
111111
$cacheFactory: $CacheFactoryProvider,

‎src/Injector.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ function inferInjectionArgs(fn) {
183183
* describe('Greeter', function(){
184184
*
185185
* beforeEach(module(function($provide) {
186-
* $provide.service('greet', GreetProvider);
186+
* $provide.provider('greet', GreetProvider);
187187
* });
188188
*
189189
* it('should greet', inject(function(greet) {
@@ -205,7 +205,7 @@ function inferInjectionArgs(fn) {
205205

206206
/**
207207
* @ngdoc method
208-
* @name angular.module.AUTO.$provide#service
208+
* @name angular.module.AUTO.$provide#provider
209209
* @methodOf angular.module.AUTO.$provide
210210
* @description
211211
*
@@ -232,7 +232,7 @@ function inferInjectionArgs(fn) {
232232
*
233233
* @param {string} name The name of the instance. NOTE: the provider will be available under `name + 'Provider'` key.
234234
* @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand for
235-
* `$provide.service(name, {$get:$getFn})`.
235+
* `$provide.provider(name, {$get: $getFn})`.
236236
* @returns {Object} registered provider instance
237237
*/
238238

@@ -294,7 +294,7 @@ function createInjector(modulesToLoad) {
294294
loadedModules = new HashMap(),
295295
providerCache = {
296296
$provide: {
297-
service: supportObject(service),
297+
provider: supportObject(provider),
298298
factory: supportObject(factory),
299299
value: supportObject(value),
300300
constant: supportObject(constant),
@@ -330,17 +330,17 @@ function createInjector(modulesToLoad) {
330330
}
331331
}
332332

333-
function service(name, provider) {
334-
if (isFunction(provider)){
335-
provider = providerInjector.instantiate(provider);
333+
function provider(name, provider_) {
334+
if (isFunction(provider_)) {
335+
provider_ = providerInjector.instantiate(provider_);
336336
}
337-
if (!provider.$get) {
337+
if (!provider_.$get) {
338338
throw Error('Provider ' + name + ' must define $get factory method.');
339339
}
340-
return providerCache[name + providerSuffix] = provider;
340+
return providerCache[name + providerSuffix] = provider_;
341341
}
342342

343-
function factory(name, factoryFn) { return service(name, { $get:factoryFn }); }
343+
function factory(name, factoryFn) { return provider(name, { $get: factoryFn }); }
344344

345345
function value(name, value) { return factory(name, valueFn(value)); }
346346

‎src/angular-mocks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@ function MockXhr() {
12711271
* The `ngMock` is an angular module which is used with `ng` module and adds unit-test configuration as well as useful
12721272
* mocks to the {@link angular.module.AUTO.$injector $injector}.
12731273
*/
1274-
angular.module('ngMock', ['ng']).service({
1274+
angular.module('ngMock', ['ng']).provider({
12751275
$browser: angular.mock.$BrowserProvider,
12761276
$exceptionHandler: angular.mock.$ExceptionHandlerProvider,
12771277
$log: angular.mock.$LogProvider,

‎src/loader.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ function setupModuleLoader(window) {
109109

110110
/**
111111
* @ngdoc method
112-
* @name angular.Module#service
112+
* @name angular.Module#provider
113113
* @methodOf angular.Module
114114
* @param {string} name service name
115115
* @param {Function} providerType Construction function for creating new instance of the service.
116116
* @description
117-
* See {@link angular.module.AUTO.$provide#service $provide.service()}.
117+
* See {@link angular.module.AUTO.$provide#provider $provide.provider()}.
118118
*/
119-
service: invokeLater('$provide', 'service'),
119+
provider: invokeLater('$provide', 'provider'),
120120

121121
/**
122122
* @ngdoc method

‎test/InjectorSpec.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ describe('injector', function() {
180180
var injector = createInjector([function($provide) {
181181
$provide.value('value', 'value;');
182182
$provide.factory('fn', valueFn('function;'));
183-
$provide.service('service', function() {
183+
$provide.provider('service', function() {
184184
this.$get = valueFn('service;');
185185
});
186186
}, function(valueProvider, fnProvider, serviceProvider) {
@@ -315,31 +315,31 @@ describe('injector', function() {
315315
});
316316

317317

318-
describe('service', function() {
319-
it('should configure $provide service object', function() {
318+
describe('provider', function() {
319+
it('should configure $provide provider object', function() {
320320
expect(createInjector([function($provide) {
321-
$provide.service('value', {
321+
$provide.provider('value', {
322322
$get: valueFn('abc')
323323
});
324324
}]).get('value')).toEqual('abc');
325325
});
326326

327327

328-
it('should configure $provide service type', function() {
328+
it('should configure $provide provider type', function() {
329329
function Type() {};
330330
Type.prototype.$get = function() {
331331
expect(this instanceof Type).toBe(true);
332332
return 'abc';
333333
};
334334
expect(createInjector([function($provide) {
335-
$provide.service('value', Type);
335+
$provide.provider('value', Type);
336336
}]).get('value')).toEqual('abc');
337337
});
338338

339339

340-
it('should configure a set of services', function() {
340+
it('should configure a set of providers', function() {
341341
expect(createInjector([function($provide) {
342-
$provide.service({value: valueFn({$get:Array})});
342+
$provide.provider({value: valueFn({$get:Array})});
343343
}]).get('value')).toEqual([]);
344344
});
345345
});

‎test/loaderSpec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('module loader', function() {
3232
var myModule = window.angular.module('my', ['other'], 'config');
3333

3434
expect(myModule.
35-
service('sk', 'sv').
35+
provider('sk', 'sv').
3636
factory('fk', 'fv').
3737
value('k', 'v').
3838
filter('f', 'ff').
@@ -45,7 +45,7 @@ describe('module loader', function() {
4545
expect(myModule._invokeQueue).toEqual([
4646
['$provide', 'constant', ['abc', 123] ],
4747
['$injector', 'invoke', ['config'] ],
48-
['$provide', 'service', ['sk', 'sv'] ],
48+
['$provide', 'provider', ['sk', 'sv'] ],
4949
['$provide', 'factory', ['fk', 'fv'] ],
5050
['$provide', 'value', ['k', 'v'] ],
5151
['$filterProvider', 'register', ['f', 'ff'] ],

‎test/service/exceptionHandlerSpec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
describe('$exceptionHandler', function() {
44
it('should log errors with single argument', function() {
55
module(function($provide){
6-
$provide.service('$exceptionHandler', $ExceptionHandlerProvider);
6+
$provide.provider('$exceptionHandler', $ExceptionHandlerProvider);
77
});
88
inject(function($log, $exceptionHandler) {
99
$exceptionHandler('myError');
@@ -14,7 +14,7 @@ describe('$exceptionHandler', function() {
1414

1515
it('should log errors with multiple arguments', function() {
1616
module(function($provide){
17-
$provide.service('$exceptionHandler', $ExceptionHandlerProvider);
17+
$provide.provider('$exceptionHandler', $ExceptionHandlerProvider);
1818
});
1919
inject(function($log, $exceptionHandler) {
2020
$exceptionHandler('myError', 'comment');

‎test/service/logSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('$log', function() {
1212
beforeEach(module(function($provide){
1313
$window = {};
1414
logger = '';
15-
$provide.service('$log', $LogProvider);
15+
$provide.provider('$log', $LogProvider);
1616
$provide.value('$exceptionHandler', angular.mock.rethrow);
1717
$provide.value('$window', $window);
1818
}));

0 commit comments

Comments
 (0)