Commite190019

committed

Fixing settings bug and update version to 3.0.6

1 parent38bdcb3 commite190019Copy full SHA for e190019

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name":"laravel-frontend-file-manager",`
`3`		`-"version":"3.0.5",`
	`3`	`+"version":"3.0.6",`
`4`	`4`	`"description":"File manager for Laravel",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"laravel",`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -129,15 +129,11 @@ export default {`
`129`	`129`	`// HTTP.defaults.baseURL = this.$store.getters['fm/settings/baseUrl'];`
`130`	`130`	`// HTTP.defaults.headers = this.$store.getters['fm/settings/headers'];`
`131`	`131`	`let settings=localstore.getStorage(localstore.axiosSettingType);`
`132`		`-let obj= {};`
`133`	`132`
`134`	`133`	`if(settings) {`
`135`		`-if(settings.data.baseURL)obj.baseURL=settings.data.baseURL;`
`136`		`-if(settings.data.headers)obj.headers=settings.data.headers;`
	`134`	`+if(settings.baseURL)axios.defaults.baseURL=settings.baseURL;`
	`135`	`+if(settings.headers)axios.defaults.headers=settings.headers;`
`137`	`136`	`}`
`138`		`-`
`139`		`-axios.defaults.baseURL=obj.baseURL;`
`140`		`-axios.defaults.headers=obj.headers;`
`141`	`137`	`},`
`142`	`138`
`143`	`139`	`/**`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ let settings = localstore.getStorage(localstore.axiosSettingType);`
`5`	`5`	`letobj={};`
`6`	`6`
`7`	`7`	`if(settings){`
`8`		`-if(settings.data.baseURL)obj.baseURL=settings.data.baseURL;`
`9`		`-if(settings.data.headers)obj.headers=settings.data.headers;`
	`8`	`+if(settings.baseURL)obj.baseURL=settings.baseURL;`
	`9`	`+if(settings.headers)obj.headers=settings.headers;`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`// set new axios instance`

Comments

(0)