Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 3fb3966

Browse files
committed
upgrade to angular 1.2.0-rc.3 ferocious-twitch
1 parent 993937a commit 3fb3966

29 files changed

+14865
-11981
lines changed

app/lib/angular/angular-animate.js

+237-101
Large diffs are not rendered by default.

app/lib/angular/angular-animate.min.js

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/angular/angular-animate.min.js.map

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/angular/angular-cookies.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.0-rc.2
2+
* @license AngularJS v1.2.0-rc.3
33
* (c) 2010-2012 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

app/lib/angular/angular-cookies.min.js

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/angular/angular-loader.js

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.0-rc.2
2+
* @license AngularJS v1.2.0-rc.3
33
* (c) 2010-2012 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -16,6 +16,8 @@
1616

1717
function setupModuleLoader(window) {
1818

19+
var $injectorMinErr = minErr('$injector');
20+
1921
function ensure(obj, name, factory) {
2022
return obj[name] || (obj[name] = factory());
2123
}
@@ -74,12 +76,13 @@ function setupModuleLoader(window) {
7476
* @returns {module} new module with the {@link angular.Module} api.
7577
*/
7678
return function module(name, requires, configFn) {
79+
assertNotHasOwnProperty(name, 'module');
7780
if (requires && modules.hasOwnProperty(name)) {
7881
modules[name] = null;
7982
}
8083
return ensure(modules, name, function() {
8184
if (!requires) {
82-
throw minErr('$injector')('nomod', "Module '{0}' is not available! You either misspelled the module name " +
85+
throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled the module name " +
8386
"or forgot to load it. If registering a module ensure that you specify the dependencies as the second " +
8487
"argument.", name);
8588
}
@@ -182,7 +185,7 @@ function setupModuleLoader(window) {
182185
* @param {Function} animationFactory Factory function for creating new instance of an animation.
183186
* @description
184187
*
185-
* **NOTE**: animations are take effect only if the **ngAnimate** module is loaded.
188+
* **NOTE**: animations take effect only if the **ngAnimate** module is loaded.
186189
*
187190
*
188191
* Defines an animation hook that can be later used with {@link ngAnimate.$animate $animate} service and
@@ -222,7 +225,8 @@ function setupModuleLoader(window) {
222225
* @ngdoc method
223226
* @name angular.Module#controller
224227
* @methodOf angular.Module
225-
* @param {string} name Controller name.
228+
* @param {string|Object} name Controller name, or an object map of controllers where the
229+
* keys are the names and the values are the constructors.
226230
* @param {Function} constructor Controller constructor function.
227231
* @description
228232
* See {@link ng.$controllerProvider#register $controllerProvider.register()}.
@@ -233,7 +237,8 @@ function setupModuleLoader(window) {
233237
* @ngdoc method
234238
* @name angular.Module#directive
235239
* @methodOf angular.Module
236-
* @param {string} name directive name
240+
* @param {string|Object} name Directive name, or an object map of directives where the
241+
* keys are the names and the values are the factories.
237242
* @param {Function} directiveFactory Factory function for creating new instance of
238243
* directives.
239244
* @description

app/lib/angular/angular-loader.min.js

+4-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/angular/angular-loader.min.js.map

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)