Skip to content

Commit a7dd09e

Browse files
committed
chore(*): prepare release 0.1.2
1 parent bf50d57 commit a7dd09e

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

dist/amd/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ define(['exports', './parser'], function (exports, _parser) {
1414

1515
function load(options) {
1616
window.env = {};
17-
var _options = Object.assign({}, options, defaultOptions);
17+
var _options = Object.assign({}, defaultOptions, options);
1818

1919
return new Promise(function (resolve, reject) {
2020
var xhr = new XMLHttpRequest();

dist/commonjs/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var defaultOptions = {
1414

1515
function load(options) {
1616
window.env = {};
17-
var _options = Object.assign({}, options, defaultOptions);
17+
var _options = Object.assign({}, defaultOptions, options);
1818

1919
return new Promise(function (resolve, reject) {
2020
var xhr = new XMLHttpRequest();

dist/es2015/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let defaultOptions = {
77

88
export function load(options) {
99
window.env = {};
10-
let _options = Object.assign({}, options, defaultOptions);
10+
let _options = Object.assign({}, defaultOptions, options);
1111

1212
return new Promise((resolve, reject) => {
1313
let xhr = new XMLHttpRequest();

dist/system/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ System.register(['./parser'], function (_export, _context) {
1313
};
1414
function load(options) {
1515
window.env = {};
16-
var _options = Object.assign({}, options, defaultOptions);
16+
var _options = Object.assign({}, defaultOptions, options);
1717

1818
return new Promise(function (resolve, reject) {
1919
var xhr = new XMLHttpRequest();

doc/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
<a name="0.1.2"></a>
2+
## [0.1.2](https://github.com/MarcScheib/aurelia-environment/compare/0.1.1...v0.1.2) (2016-04-18)
3+
4+
5+
### Bug Fixes
6+
7+
* **options:** switch default options with custom ([bf50d57](https://github.com/MarcScheib/aurelia-environment/commit/bf50d57))
8+
9+
10+
111
<a name="0.1.1"></a>
212
## [0.1.1](https://github.com/MarcScheib/aurelia-environment/compare/0.1.0...v0.1.1) (2016-04-17)
313

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-environment",
3-
"version": "0.1.1",
3+
"version": "0.1.2",
44
"description": "An environment plugin for Aurelia.",
55
"keywords": [
66
"aurelia",

0 commit comments

Comments
 (0)