Merge pull request #8310 from smayes5/fix-oclazyload

Fix oclazyload to Resolve Issue #7477
This commit is contained in:
Masahiro Wakame
2016-02-29 23:06:31 +09:00
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -89,7 +89,7 @@ angular.module('app').controller(['$ocLazyLoadProvider', function ($ocLazyLoad:
'testModule2.js'
]);
$ocLazyLoad.inject('testModule');
var promise: ng.IPromise<any> = $ocLazyLoad.inject('testModule');
$ocLazyLoad.toggleWatch(true);
}]);
}]);
+2 -2
View File
@@ -43,7 +43,7 @@ declare module oc {
* 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[]): boolean;
inject(moduleName: string|string[]): ng.IPromise<any>;
/**
* Enables or disables watching Angular for new modules. Useful in conjunction with the inject() method. Make sure to not keep the watch enabled
@@ -146,4 +146,4 @@ declare module angular {
*/
module(name: string, requires?: (string|oc.IModuleConfig)[], configFn?: Function): IModule;
}
}
}