Skip to content

Commit a3e1e00

Browse files
committed
Update angular to 1.0.0-rc1
1 parent 9806336 commit a3e1e00

File tree

9 files changed

+13254
-10627
lines changed

9 files changed

+13254
-10627
lines changed

app/lib/angular/angular-loader.js

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v0.10.6
2+
* @license AngularJS v1.0.0rc1
33
* (c) 2010-2012 AngularJS http://angularjs.org
44
* License: MIT
55
*/
@@ -59,7 +59,8 @@ function setupModuleLoader(window) {
5959
* var injector = angular.injector(['ng', 'MyModule'])
6060
* </pre>
6161
*
62-
* However it's more likely that you'll just use {@link angular.directive.ng:app ng:app} or
62+
* However it's more likely that you'll just use
63+
* {@link angular.module.ng.$compileProvider.directive.ng-app ng-app} or
6364
* {@link angular.bootstrap} to simplify this process for you.
6465
*
6566
* @param {!string} name The name of the module to create or retrieve.
@@ -114,14 +115,14 @@ function setupModuleLoader(window) {
114115

115116
/**
116117
* @ngdoc method
117-
* @name angular.Module#service
118+
* @name angular.Module#provider
118119
* @methodOf angular.Module
119120
* @param {string} name service name
120121
* @param {Function} providerType Construction function for creating new instance of the service.
121122
* @description
122-
* See {@link angular.module.AUTO.$provide#service $provide.service()}.
123+
* See {@link angular.module.AUTO.$provide#provider $provide.provider()}.
123124
*/
124-
service: invokeLater('$provide', 'service'),
125+
provider: invokeLater('$provide', 'provider'),
125126

126127
/**
127128
* @ngdoc method
@@ -130,10 +131,21 @@ function setupModuleLoader(window) {
130131
* @param {string} name service name
131132
* @param {Function} providerFunction Function for creating new instance of the service.
132133
* @description
133-
* See {@link angular.module.AUTO.$provide#service $provide.factory()}.
134+
* See {@link angular.module.AUTO.$provide#factory $provide.factory()}.
134135
*/
135136
factory: invokeLater('$provide', 'factory'),
136137

138+
/**
139+
* @ngdoc method
140+
* @name angular.Module#service
141+
* @methodOf angular.Module
142+
* @param {string} name service name
143+
* @param {Function} constructor A constructor function that will be instantiated.
144+
* @description
145+
* See {@link angular.module.AUTO.$provide#service $provide.service()}.
146+
*/
147+
service: invokeLater('$provide', 'service'),
148+
137149
/**
138150
* @ngdoc method
139151
* @name angular.Module#value
@@ -145,17 +157,41 @@ function setupModuleLoader(window) {
145157
*/
146158
value: invokeLater('$provide', 'value'),
147159

160+
/**
161+
* @ngdoc method
162+
* @name angular.Module#constant
163+
* @methodOf angular.Module
164+
* @param {string} name constant name
165+
* @param {*} object Constant value.
166+
* @description
167+
* Because the constant are fixed, they get applied before other provide methods.
168+
* See {@link angular.module.AUTO.$provide#constant $provide.constant()}.
169+
*/
170+
constant: invokeLater('$provide', 'constant', 'unshift'),
171+
148172
/**
149173
* @ngdoc method
150174
* @name angular.Module#filter
151175
* @methodOf angular.Module
152-
* @param {string} name filterr name
176+
* @param {string} name filter name
153177
* @param {Function} filterFactory Factory function for creating new instance of filter.
154178
* @description
155179
* See {@link angular.module.ng.$filterProvider#register $filterProvider.register()}.
156180
*/
157181
filter: invokeLater('$filterProvider', 'register'),
158182

183+
/**
184+
* @ngdoc method
185+
* @name angular.Module#directive
186+
* @methodOf angular.Module
187+
* @param {string} name directive name
188+
* @param {Function} directiveFactory Factory function for creating new instance of
189+
* directives.
190+
* @description
191+
* See {@link angular.module.ng.$compileProvider.directive $compileProvider.directive()}.
192+
*/
193+
directive: invokeLater('$compileProvider', 'directive'),
194+
159195
/**
160196
* @ngdoc method
161197
* @name angular.Module#config
@@ -192,11 +228,12 @@ function setupModuleLoader(window) {
192228
/**
193229
* @param {string} provider
194230
* @param {string} method
231+
* @param {String=} insertMethod
195232
* @returns {angular.Module}
196233
*/
197-
function invokeLater(provider, method) {
234+
function invokeLater(provider, method, insertMethod) {
198235
return function() {
199-
invokeQueue.push([provider, method, arguments]);
236+
invokeQueue[insertMethod || 'push']([provider, method, arguments]);
200237
return moduleInstance;
201238
}
202239
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
AngularJS v0.10.6
2+
AngularJS v1.0.0rc1
33
(c) 2010-2012 AngularJS http://angularjs.org
44
License: MIT
55
*/
6-
'use strict';(function(i){function d(a,b,c){return a[b]||(a[b]=c())}return d(d(i,"angular",Object),"module",function(){var a={};return function(b,c,e){c&&a.hasOwnProperty(b)&&(a[b]=null);return d(a,b,function(){function a(b,c){return function(){d.push([b,c,arguments]);return f}}if(!c)throw Error("No module: "+b);var d=[],g=[],h=a("$injector","invoke"),f={_invokeQueue:d,_runBlocks:g,requires:c,name:b,service:a("$provide","service"),factory:a("$provide","factory"),value:a("$provide","value"),filter:a("$filterProvider",
7-
"register"),config:h,run:function(a){g.push(a);return this}};e&&h(e);return f})}})})(window);
6+
'use strict';(function(i){function d(c,a,e){return c[a]||(c[a]=e())}return d(d(i,"angular",Object),"module",function(){var c={};return function(a,e,f){e&&c.hasOwnProperty(a)&&(c[a]=null);return d(c,a,function(){function b(a,b,d){return function(){c[d||"push"]([a,b,arguments]);return g}}if(!e)throw Error("No module: "+a);var c=[],d=[],h=b("$injector","invoke"),g={_invokeQueue:c,_runBlocks:d,requires:e,name:a,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),
7+
value:b("$provide","value"),constant:b("$provide","constant","unshift"),filter:b("$filterProvider","register"),directive:b("$compileProvider","directive"),config:h,run:function(a){d.push(a);return this}};f&&h(f);return g})}})})(window);

0 commit comments

Comments
 (0)