Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
+4 -4
View File
@@ -5,12 +5,12 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module oc {
declare namespace oc {
interface ILazyLoad {
/**
* Loads a module or a list of modules into Angular.
*
*
* @param module The name of a predefined module config object, or a module config object, or an array of either
* @param config Options to be used when loading the modules
*/
@@ -40,7 +40,7 @@ declare module oc {
isLoaded(moduleName: string|string[]): boolean;
/**
* Injects a module with the associated name into Angular. Useful for manual injection when loading through RequireJS, SystemJS, etc. Useful in
* Injects a module with the associated name into Angular. Useful for manual injection when loading through RequireJS, SystemJS, etc. Useful in
* conjunction with the toggleWatch() method.
*/
inject(moduleName: string|string[]): ng.IPromise<any>;
@@ -133,7 +133,7 @@ declare module oc {
}
}
declare module angular {
declare namespace angular {
interface IAngularStatic {
/**
* The angular.module is a global place for creating, registering and retrieving Angular modules. All modules (angular core or 3rd party) that should be available to an application must be registered using this mechanism.