From 61ad535909c95ab20cdc555c2a94fd075bfd6016 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 13 Jan 2015 14:18:24 +0100
Subject: [PATCH] [tomahawk.js] Don't override all settings passed to
 Tomahawk.ajax/post if url is passed as first parameter

Thanks to Will Stott (@willstott101) for catching the actual bug and finding a typo in
the first version of this commit.
---
 data/js/tomahawk.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/data/js/tomahawk.js b/data/js/tomahawk.js
index 5d8ecb1a2..f8ad56f1a 100644
--- a/data/js/tomahawk.js
+++ b/data/js/tomahawk.js
@@ -476,9 +476,8 @@ Tomahawk.ajax = function(url, settings) {
     if (typeof url === "object") {
         settings = url;
     } else {
-        settings = {
-            url: url
-        };
+        settings = settings || {};
+        settings.url = url;
     }
 
     settings.method = settings.type;
@@ -539,9 +538,8 @@ Tomahawk.post = function(url, settings) {
     if (typeof url === "object") {
         settings = url;
     } else {
-        settings = {
-            url: url
-        };
+        settings = settings || {};
+        settings: url;
     }
 
     settings.method = 'POST';