Skip to content

Commit dbce8a1

Browse files
committed
fix: replace Object.assign with _.extend
fixed #599
1 parent 8a60845 commit dbce8a1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/adapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const _ = require('underscore');
12
const adapters = {};
23

34
const getAdapter = name => {
@@ -8,7 +9,7 @@ const getAdapter = name => {
89
return adapter;
910
};
1011
const setAdapters = newAdapters => {
11-
Object.assign(adapters, newAdapters);
12+
_.extend(adapters, newAdapters);
1213
};
1314

1415
module.exports = {

src/uploader/s3.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const _ = require('underscore');
12
const { ajax } = require('../utils');
23

34
module.exports = function upload(uploadInfo, data, file, saveOptions = {}) {
@@ -18,7 +19,7 @@ module.exports = function upload(uploadInfo, data, file, saveOptions = {}) {
1819
url: uploadInfo.upload_url,
1920
method: 'PUT',
2021
data,
21-
headers: Object.assign(
22+
headers: _.extend(
2223
{
2324
'Content-Type': file.get('mime_type'),
2425
'Cache-Control': 'public, max-age=31536000',

0 commit comments

Comments
 (0)