From 30b29f63c470eb0e92c53ad7df67d6bcf8a25914 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 29 Dec 2013 09:54:11 -0500 Subject: be more tolerant of media folder names with invalid url chars --- MediaBrowser.WebDashboard/ApiClient.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'MediaBrowser.WebDashboard/ApiClient.js') diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js index 18c007962..274be16b9 100644 --- a/MediaBrowser.WebDashboard/ApiClient.js +++ b/MediaBrowser.WebDashboard/ApiClient.js @@ -1328,10 +1328,9 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - url += "/" + name; - url = self.getUrl(url, { - refreshLibrary: refreshLibrary ? true : false + refreshLibrary: refreshLibrary ? true : false, + name: name }); return self.ajax({ @@ -1357,10 +1356,10 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi } options.refreshLibrary = refreshLibrary ? true : false; + options.name = name; var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - url += "/" + name; url = self.getUrl(url, options); return self.ajax({ @@ -1381,11 +1380,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - url += "/" + name + "/Name"; + url += "/Name"; url = self.getUrl(url, { refreshLibrary: refreshLibrary ? true : false, - newName: newName + newName: newName, + name: name }); return self.ajax({ @@ -1410,11 +1410,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - url += "/" + virtualFolderName + "/Paths"; + url += "/Paths"; url = self.getUrl(url, { refreshLibrary: refreshLibrary ? true : false, - path: mediaPath + path: mediaPath, + name: virtualFolderName }); return self.ajax({ @@ -1439,11 +1440,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - url += "/" + virtualFolderName + "/Paths"; + url += "/Paths"; url = self.getUrl(url, { refreshLibrary: refreshLibrary ? true : false, - path: mediaPath + path: mediaPath, + name: virtualFolderName }); return self.ajax({ -- cgit v1.2.3