mirror of
https://github.com/tenrok/axios.git
synced 2026-06-14 18:42:33 +03:00
Fixing bug with custom intances and global defaults
This commit is contained in:
+4
-3
@@ -3,6 +3,7 @@
|
||||
var utils = require('./utils');
|
||||
var bind = require('./helpers/bind');
|
||||
var Axios = require('./core/Axios');
|
||||
var defaults = require('./defaults');
|
||||
|
||||
/**
|
||||
* Create an instance of Axios
|
||||
@@ -24,14 +25,14 @@ function createInstance(defaultConfig) {
|
||||
}
|
||||
|
||||
// Create the default instance to be exported
|
||||
var axios = createInstance();
|
||||
var axios = createInstance(defaults);
|
||||
|
||||
// Expose Axios class to allow class inheritance
|
||||
axios.Axios = Axios;
|
||||
|
||||
// Factory for creating new instances
|
||||
axios.create = function create(defaultConfig) {
|
||||
return createInstance(defaultConfig);
|
||||
axios.create = function create(instanceConfig) {
|
||||
return createInstance(utils.merge(defaults, instanceConfig));
|
||||
};
|
||||
|
||||
// Expose Cancel & CancelToken
|
||||
|
||||
+3
-3
@@ -10,10 +10,10 @@ var combineURLs = require('./../helpers/combineURLs');
|
||||
/**
|
||||
* Create a new instance of Axios
|
||||
*
|
||||
* @param {Object} defaultConfig The default config for the instance
|
||||
* @param {Object} instanceConfig The default config for the instance
|
||||
*/
|
||||
function Axios(defaultConfig) {
|
||||
this.defaults = utils.merge(defaults, defaultConfig);
|
||||
function Axios(instanceConfig) {
|
||||
this.defaults = instanceConfig;
|
||||
this.interceptors = {
|
||||
request: new InterceptorManager(),
|
||||
response: new InterceptorManager()
|
||||
|
||||
Reference in New Issue
Block a user