Skip to content

Commit 6a6f760

Browse files
committed
Updated.
1 parent 1c1f893 commit 6a6f760

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "laravel-frontend-file-manager",
3-
"version": "3.0.8",
3+
"version": "3.0.9",
44
"description": "File manager for Laravel",
55
"keywords": [
66
"laravel",

src/FileManager.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,11 @@ export default {
131131
let settings = localstore.getStorage(localstore.axiosSettingType);
132132
133133
if(settings) {
134-
if(settings.baseURL) HTTP.defaults.baseURL = settings.baseURL;
135-
if(settings.withCredentials) HTTP.defaults.withCredentials = settings.withCredentials;
136-
if(settings.headers) HTTP.defaults.headers = settings.headers;
134+
if(settings.baseURL) HTTP.baseURL = settings.baseURL;
135+
if(settings.withCredentials) HTTP.withCredentials = settings.withCredentials;
136+
if(settings.headers) HTTP.headers = settings.headers;
137+
} else {
138+
throw `settings.baseURL: ${settings.baseURL}, settings.withCredentials: ${settings.withCredentials}, settings.headers: ${settings.headers} is set!`;
137139
}
138140
},
139141

src/http/axios.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ import axios from 'axios';
22
import localstore from '../mixins/localstore';
33

44
let settings = localstore.getStorage(localstore.axiosSettingType);
5+
let axiosSettings = {};
56

67
if(settings) {
7-
if(settings.baseURL) axios.defaults.baseURL = settings.baseURL;
8-
if(settings.withCredentials) axios.defaults.withCredentials = settings.withCredentials;
9-
if(settings.headers) axios.defaults.headers = settings.headers;
8+
if(settings.baseURL) axiosSettings.baseURL = settings.baseURL;
9+
if(settings.withCredentials) axiosSettings.withCredentials = settings.withCredentials;
10+
if(settings.headers) axiosSettings.headers = settings.headers;
1011
}
1112

1213
// set new axios instance
13-
export default axios;
14+
export default axios.create({
15+
axiosSettings
16+
});

0 commit comments

Comments
 (0)