mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-17 19:21:29 +03:00
Code Activity

Merge branch 'master' of github.com:mzabriskie/axios

Browse Source
This commit is contained in:
mzabriskie
2015-09-28 18:34:10 -06:00
parent 6aa766e5e9 a9d2f84a62
commit eca2ac88eb
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
axios.d.ts
Vendored
+2 -2
View File
@@ -26,8 +26,8 @@ declare module axios {
} }
interface Promise { interface Promise {
then(response: axios.Response): axios.Promise; then(onFulfilled:(response: axios.Response) => void): axios.Promise;
catch(response: axios.Response): axios.Promise; catch(onRejected:(response: axios.Response) => void): axios.Promise;
} }
interface RequestOptions { interface RequestOptions {
lib/axios.js
+1
View File
@@ -9,6 +9,7 @@ var axios = module.exports = function (config) {
config = utils.merge({ config = utils.merge({
method: 'get', method: 'get',
headers: {}, headers: {},
timeout: defaults.timeout,
transformRequest: defaults.transformRequest, transformRequest: defaults.transformRequest,
transformResponse: defaults.transformResponse transformResponse: defaults.transformResponse
}, config); }, config);
package.json
+2
View File
@@ -31,6 +31,7 @@
"es6-promise": "^3.0.2", "es6-promise": "^3.0.2",
"grunt": "^0.4.5", "grunt": "^0.4.5",
"grunt-banner": "^0.5.0", "grunt-banner": "^0.5.0",
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "^0.6.0", "grunt-contrib-clean": "^0.6.0",
"grunt-contrib-nodeunit": "^0.4.1", "grunt-contrib-nodeunit": "^0.4.1",
"grunt-contrib-watch": "^0.6.1", "grunt-contrib-watch": "^0.6.1",
@@ -49,6 +50,7 @@
"karma-webpack": "^1.7.0", "karma-webpack": "^1.7.0",
"load-grunt-tasks": "^3.2.0", "load-grunt-tasks": "^3.2.0",
"minimist": "^1.1.3", "minimist": "^1.1.3",
"phantomjs": "^1.9.18",
"webpack": "^1.11.0", "webpack": "^1.11.0",
"webpack-dev-server": "^1.10.1" "webpack-dev-server": "^1.10.1"
}, },