Merge branch 'master' of https://github.com/philippd/angular-deferred-bootstrap

philippd · philippd · commit 9c5964a9d38e · 2014-09-06T15:28:27.000+02:00
* 'master' of https://github.com/philippd/angular-deferred-bootstrap: Release 0.1.3 Fixed bug that the resolve functions were called twice. Update README.md
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# angular-deferred-bootstrap [![Build Status](https://travis-ci.org/philippd/angular-deferred-bootstrap.svg?branch=master)](https://travis-ci.org/philippd/angular-deferred-bootstrap)
+# angular-deferred-bootstrap [![Build Status](https://travis-ci.org/philippd/angular-deferred-bootstrap.svg?branch=master)](https://travis-ci.org/philippd/angular-deferred-bootstrap) [![Coverage Status](https://img.shields.io/coveralls/philippd/angular-deferred-bootstrap.svg)](https://coveralls.io/r/philippd/angular-deferred-bootstrap?branch=master)
 
 > Initialize your AngularJS app with constants loaded from the back-end.
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-deferred-bootstrap",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "homepage": "https://github.com/philippd/angular-deferred-bootstrap",
   "authors": [
     "Philipp Denzler <philippd@gmail.com>"
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,9 @@
 # Changelog
 
-## 0.1.2. - 2014-08-04
+## 0.1.3 - 2014-08-08
+- Fixed bug that the resolve function was called twice during bootstrapping, see aea0e2058e3c5bb881a92a1b3c277e4f0aed6dc5
+
+## 0.1.2 - 2014-08-04
 - Added ability to specify which module a constant is added to, implemented by [@Shepless](https://github.com/Shepless), see [#16](https://github.com/philippd/angular-deferred-bootstrap/pull/16)
 
 ## 0.1.1 - 2014-07-04
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-deferred-bootstrap",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Initialize AngularJS apps with constants loaded from the back-end",
   "homepage": "https://github.com/philippd/angular-deferred-bootstrap",
   "repository": {
diff --git a/src/deferred-bootstrap.js b/src/deferred-bootstrap.js
@@ -143,8 +143,6 @@ function bootstrap (configParam) {
     }
   }
 
-  forEach(config.resolve, callResolveFn);
-
   if (config.moduleResolves) {
     forEach(config.moduleResolves, function (moduleResolve, index) {
       forEach(moduleResolve.resolve, function (resolveFunction, constantName) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# angular-deferred-bootstrap [![Build Status](https://travis-ci.org/philippd/angular-deferred-bootstrap.svg?branch=master)](https://travis-ci.org/philippd/angular-deferred-bootstrap)`
	`1`	`+# angular-deferred-bootstrap [![Build Status](https://travis-ci.org/philippd/angular-deferred-bootstrap.svg?branch=master)](https://travis-ci.org/philippd/angular-deferred-bootstrap) [![Coverage Status](https://img.shields.io/coveralls/philippd/angular-deferred-bootstrap.svg)](https://coveralls.io/r/philippd/angular-deferred-bootstrap?branch=master)`
`2`	`2`
`3`	`3`	`> Initialize your AngularJS app with constants loaded from the back-end.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-deferred-bootstrap",`
`3`		`- "version": "0.1.2",`
	`3`	`+ "version": "0.1.3",`
`4`	`4`	`"homepage": "https://github.com/philippd/angular-deferred-bootstrap",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Philipp Denzler <[email protected]>"`
Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,6 @@ function bootstrap (configParam) {`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`146`		`- forEach(config.resolve, callResolveFn);`
`147`		`-`
`148`	`146`	`if (config.moduleResolves) {`
`149`	`147`	`forEach(config.moduleResolves, function (moduleResolve, index) {`
`150`	`148`	`forEach(moduleResolve.resolve, function (resolveFunction, constantName) {`