Skip to content

Commit

Permalink
Merge pull request #41 from young-steveo/release-1.2.1
Browse files Browse the repository at this point in the history
Release 1.2.1
  • Loading branch information
young-steveo committed Dec 14, 2015
2 parents 7fba985 + 3a0eb0c commit 509622c
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bottlejs",
"version": "1.2.0",
"version": "1.2.1",
"description": "A powerful dependency injection micro container",
"main": "dist/bottle.min.js",
"license": "MIT",
Expand Down
8 changes: 4 additions & 4 deletions dist/bottle.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;(function(undefined) {
'use strict';
/**
* BottleJS v1.2.0 - 2015-12-02
* BottleJS v1.2.1 - 2015-12-14
* A powerful dependency injection micro container
*
* Copyright (c) 2015 Stephen Young
Expand Down Expand Up @@ -373,12 +373,12 @@
var provider = container[providerName];
var instance;
if (provider) {
delete container[providerName];
delete container[name];

// filter through decorators
instance = getAllWithMapped(decorators, id, name)
.reduce(reducer, provider.$get(container));

delete container[providerName];
delete container[name];
}
return instance === undefined ? instance : applyMiddleware(id, name, instance, container);
}
Expand Down
4 changes: 2 additions & 2 deletions dist/bottle.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/bottle.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 509622c

Please sign in to comment.