Skip to content

Commit

Permalink
v0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
passy committed Jan 13, 2014
1 parent 68fec09 commit bdf9104
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 11 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
# Changelog
<a name="v0.4.0"></a>
## v0.4.0 (2014-01-13)


#### Bug Fixes

* **loader:** extending headers by itself ([8c7739a7](http://github.com/weluse/hyperagent/commit/8c7739a7962efd29f24012af8bffdbbe9fb48702))


#### Features

* **build:** changelog is now automatically generated ([68fec099](http://github.com/weluse/hyperagent/commit/68fec0997be743a76861e7b98e7f58cb41d120fc))
* **deps:** update Q and URIjs deps ([8d3e098c](http://github.com/weluse/hyperagent/commit/8d3e098c7438cb98d78d342c7a8fad59638c01c1))

## v0.3.0 (2013-08-07)

Expand Down
8 changes: 5 additions & 3 deletions dist/amd/hyperagent/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ define("/hyperagent/loader",

function loadAjax(options) {
var deferred = config.defer();
config.ajax(config._.extend({
headers: {
if (options.headers) {
config._.extend(options.headers, {
'Accept': 'application/hal+json, application/json, */*; q=0.01',
'X-Requested-With': 'XMLHttpRequest'
},
});
}
config.ajax(config._.extend({
success: deferred.resolve,
error: deferred.reject,
dataType: 'html' // We don't want auto-converting
Expand Down
8 changes: 5 additions & 3 deletions dist/commonjs/hyperagent/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ var config = require("hyperagent/config").config;

function loadAjax(options) {
var deferred = config.defer();
config.ajax(config._.extend({
headers: {
if (options.headers) {
config._.extend(options.headers, {
'Accept': 'application/hal+json, application/json, */*; q=0.01',
'X-Requested-With': 'XMLHttpRequest'
},
});
}
config.ajax(config._.extend({
success: deferred.resolve,
error: deferred.reject,
dataType: 'html' // We don't want auto-converting
Expand Down
8 changes: 5 additions & 3 deletions dist/hyperagent.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,13 @@ define("hyperagent/loader",

function loadAjax(options) {
var deferred = config.defer();
config.ajax(config._.extend({
headers: {
if (options.headers) {
config._.extend(options.headers, {
'Accept': 'application/hal+json, application/json, */*; q=0.01',
'X-Requested-With': 'XMLHttpRequest'
},
});
}
config.ajax(config._.extend({
success: deferred.resolve,
error: deferred.reject,
dataType: 'html' // We don't want auto-converting
Expand Down
2 changes: 1 addition & 1 deletion dist/hyperagent.min.js

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

0 comments on commit bdf9104

Please sign in to comment.