From 5db31acf2052234940a33e95f15f4336e919634b Mon Sep 17 00:00:00 2001 From: Juanfran Date: Mon, 8 Feb 2016 14:58:05 +0100 Subject: [PATCH] merge to assign - lodash --- app/coffee/modules/base/http.coffee | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/coffee/modules/base/http.coffee b/app/coffee/modules/base/http.coffee index 2144e3fb..a2af080d 100644 --- a/app/coffee/modules/base/http.coffee +++ b/app/coffee/modules/base/http.coffee @@ -47,12 +47,14 @@ class HttpService extends taiga.Service return headers request: (options) -> - options.headers = _.merge({}, options.headers or {}, @.headers()) + options.headers = _.assign({}, options.headers or {}, @.headers()) + + console.log options return @http(options) get: (url, params, options) -> - options = _.merge({method: "GET", url: url}, options) + options = _.assign({method: "GET", url: url}, options) options.params = params if params # prevent duplicated http request @@ -62,25 +64,27 @@ class HttpService extends taiga.Service @.cache.removeAll() post: (url, data, params, options) -> - options = _.merge({method: "POST", url: url}, options) + options = _.assign({method: "POST", url: url}, options) + options.data = data if data options.params = params if params + return @.request(options) put: (url, data, params, options) -> - options = _.merge({method: "PUT", url: url}, options) + options = _.assign({method: "PUT", url: url}, options) options.data = data if data options.params = params if params return @.request(options) patch: (url, data, params, options) -> - options = _.merge({method: "PATCH", url: url}, options) + options = _.assign({method: "PATCH", url: url}, options) options.data = data if data options.params = params if params return @.request(options) delete: (url, data, params, options) -> - options = _.merge({method: "DELETE", url: url}, options) + options = _.assign({method: "DELETE", url: url}, options) options.data = data if data options.params = params if params return @.request(options)