Skip to content

Commit 3a214d1

Browse files
committed
Merge pull request #40 from D34THWINGS/feat/amd-commonjs-support
Added support for CommonJS and AMD modules
2 parents 7849904 + 0a03f84 commit 3a214d1

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"predef": ["describe", "it", "beforeEach", "waitsFor", "expect", "angular", "spyOn", "jasmine"],
2+
"predef": ["describe", "it", "beforeEach", "waitsFor", "expect", "angular", "spyOn", "jasmine", "define"],
33
"esnext": false,
44
"bitwise": true,
55
"curly": true,

bower.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"authors": [
66
"Philipp Denzler <[email protected]>"
77
],
8+
"main": "angular-deferred-bootstrap.js",
89
"license": "MIT",
910
"ignore": [
1011
"**/.*",

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"author": {
1515
"name": "Philipp Denzler"
1616
},
17+
"main": "angular-deferred-bootstrap.js",
1718
"license": "MIT",
1819
"devDependencies": {
1920
"bower": "~1.3.8",

src/deferred-bootstrap.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,14 @@ function bootstrap (configParam) {
171171
return $q.all(promises).then(handleResults, handleError);
172172
}
173173

174-
window.deferredBootstrapper = {
174+
var deferredBootstrapper = {
175175
bootstrap: bootstrap
176176
};
177+
178+
if(typeof define === 'function' && define.amd) {
179+
define(['deferredBootstrapper'], deferredBootstrapper);
180+
} else if(typeof module === 'object' && module.exports) {
181+
module.exports = deferredBootstrapper;
182+
} else {
183+
window.deferredBootstrapper = deferredBootstrapper;
184+
}

0 commit comments

Comments
 (0)