__proto__ in objects in IE8

kornel-kedzierski · Nov 21, 2013 · fca2a20 · fca2a20
1 parent f87e6a7
commit fca2a20
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -277,7 +277,7 @@ $ npm test
 
 ## Changelog
 
-* 1.6.6
+* 1.6.6 - 1.6.7
 	+ Bugs in Internet Explorer 8
 
 * 1.6.2 - 1.6.5

diff --git a/lib/DIConfigurator.js b/lib/DIConfigurator.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "dependency-injection",
 	"description": "Dependency injection with configuration and autowire for node js and browser",
-	"version": "1.6.6",
+	"version": "1.6.7",
 	"author": {
 		"name": "David Kudera",
 		"email": "sakren@gmail.com"

diff --git a/src/DIConfigurator.coffee b/src/DIConfigurator.coffee
@@ -32,7 +32,7 @@ class DIConfigurator
 			config = @getConfig()
 
 			for name of config
-				if config.hasOwnProperty(name)
+				if config.hasOwnProperty(name) && name not in ['__proto__']
 					config[name] = @configurator.merge(config[name], defaultService)
 
 			return config