diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js index 7fa2e060a7..d86654430f 100644 --- a/dashboard-ui/scripts/channelitems.js +++ b/dashboard-ui/scripts/channelitems.js @@ -42,7 +42,7 @@ var channelId = getParameterByName('id'); - $.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Features", query)).done(function (features) { + ApiClient.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Features", query)).done(function (features) { if (features.CanFilter) { @@ -121,7 +121,7 @@ query.folderId = folderId; - $.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) { + ApiClient.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) { // Scroll back up so they can see the results from the beginning $(document).scrollTop(0); diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js index 456aa497ae..21973f11bc 100644 --- a/dashboard-ui/scripts/channels.js +++ b/dashboard-ui/scripts/channels.js @@ -12,7 +12,7 @@ query.UserId = Dashboard.getCurrentUserId(); - $.getJSON(ApiClient.getUrl("Channels", query)).done(function (result) { + ApiClient.getJSON(ApiClient.getUrl("Channels", query)).done(function (result) { // Scroll back up so they can see the results from the beginning $(document).scrollTop(0); diff --git a/dashboard-ui/scripts/channelsettings.js b/dashboard-ui/scripts/channelsettings.js index f0f10fe5bd..a7db6ca35e 100644 --- a/dashboard-ui/scripts/channelsettings.js +++ b/dashboard-ui/scripts/channelsettings.js @@ -84,7 +84,7 @@ var page = this; var promise1 = ApiClient.getNamedConfiguration("channels"); - var promise2 = $.getJSON(ApiClient.getUrl("Channels/Features")); + var promise2 = ApiClient.getJSON(ApiClient.getUrl("Channels/Features")); $.when(promise1, promise2).done(function (response1, response2) { diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js index 84058a5138..e05ed32de1 100644 --- a/dashboard-ui/scripts/dashboardgeneral.js +++ b/dashboard-ui/scripts/dashboardgeneral.js @@ -21,7 +21,7 @@ var promise1 = ApiClient.getServerConfiguration(); - var promise2 = $.getJSON(ApiClient.getUrl("Localization/Options")); + var promise2 = ApiClient.getJSON(ApiClient.getUrl("Localization/Options")); $.when(promise1, promise2).done(function (response1, response2) { diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js index 5e62b16e6e..9f5be97c13 100644 --- a/dashboard-ui/scripts/dlnaprofile.js +++ b/dashboard-ui/scripts/dlnaprofile.js @@ -29,7 +29,7 @@ var url = id ? 'Dlna/Profiles/' + id : 'Dlna/Profiles/Default'; - return $.getJSON(ApiClient.getUrl(url)); + return ApiClient.getJSON(ApiClient.getUrl(url)); } function renderProfile(page, profile, users) { @@ -627,7 +627,7 @@ if (id) { - $.ajax({ + ApiClient.ajax({ type: "POST", url: ApiClient.getUrl("Dlna/Profiles/" + id), data: JSON.stringify(profile), @@ -639,7 +639,7 @@ } else { - $.ajax({ + ApiClient.ajax({ type: "POST", url: ApiClient.getUrl("Dlna/Profiles"), data: JSON.stringify(profile), diff --git a/dashboard-ui/scripts/dlnaprofiles.js b/dashboard-ui/scripts/dlnaprofiles.js index 234829582c..5f0edf1939 100644 --- a/dashboard-ui/scripts/dlnaprofiles.js +++ b/dashboard-ui/scripts/dlnaprofiles.js @@ -4,7 +4,7 @@ Dashboard.showLoadingMsg(); - $.getJSON(ApiClient.getUrl("Dlna/ProfileInfos")).done(function (result) { + ApiClient.getJSON(ApiClient.getUrl("Dlna/ProfileInfos")).done(function (result) { renderProfiles(page, result); @@ -88,7 +88,7 @@ Dashboard.showLoadingMsg(); - $.ajax({ + ApiClient.ajax({ type: "DELETE", url: ApiClient.getUrl("Dlna/Profiles/" + id) diff --git a/dashboard-ui/scripts/editcollectionitems.js b/dashboard-ui/scripts/editcollectionitems.js index 05ca9f74ff..cfc2239ca1 100644 --- a/dashboard-ui/scripts/editcollectionitems.js +++ b/dashboard-ui/scripts/editcollectionitems.js @@ -184,7 +184,7 @@ }); - $.ajax({ + ApiClient.ajax({ type: "POST", url: url @@ -217,7 +217,7 @@ }); - $.ajax({ + ApiClient.ajax({ type: "DELETE", url: url diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 078c21ed8e..5022c6c0dc 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -44,7 +44,7 @@ var languages = response2[0]; var countries = response3[0]; - $.getJSON(ApiClient.getUrl("Items/" + item.Id + "/ExternalIdInfos")).done(function (idList) { + ApiClient.getJSON(ApiClient.getUrl("Items/" + item.Id + "/ExternalIdInfos")).done(function (idList) { loadExternalIds(page, item, idList); }); @@ -1002,7 +1002,7 @@ var item = currentItem; - $.getJSON(ApiClient.getUrl("Items/" + item.Id + "/ExternalIdInfos")).done(function (idList) { + ApiClient.getJSON(ApiClient.getUrl("Items/" + item.Id + "/ExternalIdInfos")).done(function (idList) { var html = ''; @@ -1100,7 +1100,7 @@ Dashboard.showLoadingMsg(); - $.ajax({ + ApiClient.ajax({ type: "POST", url: ApiClient.getUrl("Items/RemoteSearch/" + currentItem.Type), data: JSON.stringify(lookupInfo), @@ -1180,7 +1180,7 @@ var currentResult = results[index]; - $.ajax({ + ApiClient.ajax({ type: "POST", url: ApiClient.getUrl("Items/RemoteSearch/Apply/" + currentItem.Id), data: JSON.stringify(currentResult), diff --git a/dashboard-ui/scripts/edititemsubtitles.js b/dashboard-ui/scripts/edititemsubtitles.js index 545c64e0dd..7c201c1b79 100644 --- a/dashboard-ui/scripts/edititemsubtitles.js +++ b/dashboard-ui/scripts/edititemsubtitles.js @@ -52,7 +52,7 @@ var url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id; - $.ajax({ + ApiClient.ajax({ type: "POST", url: ApiClient.getUrl(url) @@ -75,7 +75,7 @@ var url = 'Videos/' + currentItem.Id + '/Subtitles/' + index; - $.ajax({ + ApiClient.ajax({ type: "DELETE", url: ApiClient.getUrl(url) @@ -257,7 +257,7 @@ var url = ApiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language); - $.getJSON(url).done(function (results) { + ApiClient.getJSON(url).done(function (results) { renderSearchResults(page, results); }); diff --git a/dashboard-ui/scripts/editorsidebar.js b/dashboard-ui/scripts/editorsidebar.js index bcaf1d6873..ae26ff4c59 100644 --- a/dashboard-ui/scripts/editorsidebar.js +++ b/dashboard-ui/scripts/editorsidebar.js @@ -123,7 +123,7 @@ function loadMediaFolders(service, openItems, callback) { - $.getJSON(ApiClient.getUrl("Library/MediaFolders")).done(function (result) { + ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders")).done(function (result) { var nodes = result.Items.map(function (i) { diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index 3656a4c823..0e085fb90d 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -175,7 +175,7 @@ UserId: userId }; - $.getJSON(ApiClient.getUrl("Channels/Items/Latest", options)).done(function (result) { + ApiClient.getJSON(ApiClient.getUrl("Channels/Items/Latest", options)).done(function (result) { var html = ''; @@ -327,7 +327,7 @@ SupportsLatestItems: true }); - $.getJSON(ApiClient.getUrl("Channels", options)).done(function (result) { + ApiClient.getJSON(ApiClient.getUrl("Channels", options)).done(function (result) { var channels = result.Items; @@ -362,7 +362,7 @@ ChannelIds: channel.Id }; - $.getJSON(ApiClient.getUrl("Channels/Items/Latest", options)).done(function (result) { + ApiClient.getJSON(ApiClient.getUrl("Channels/Items/Latest", options)).done(function (result) { var html = ''; diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 1f83c94ad5..66e99ff162 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -1423,7 +1423,7 @@ Dashboard.showLoadingMsg(); - $.ajax({ + ApiClient.ajax({ type: "DELETE", url: ApiClient.getUrl("Videos/" + id + "/AlternateSources") diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 457ebffd73..3100aa5a87 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -436,7 +436,7 @@ Dashboard.showLoadingMsg(); - $.ajax({ + ApiClient.ajax({ type: "POST", url: ApiClient.getUrl("Videos/MergeVersions", { Ids: selection.join(',') }) diff --git a/dashboard-ui/scripts/metadatachapters.js b/dashboard-ui/scripts/metadatachapters.js index edb611fb5e..fee15886d0 100644 --- a/dashboard-ui/scripts/metadatachapters.js +++ b/dashboard-ui/scripts/metadatachapters.js @@ -117,7 +117,7 @@ var page = this; var promise1 = ApiClient.getNamedConfiguration("chapters"); - var promise2 = $.getJSON(ApiClient.getUrl("Providers/Chapters")); + var promise2 = ApiClient.getJSON(ApiClient.getUrl("Providers/Chapters")); $.when(promise1, promise2).done(function (response1, response2) { diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js index 5b5a700242..029f8d3878 100644 --- a/dashboard-ui/scripts/metadataimagespage.js +++ b/dashboard-ui/scripts/metadataimagespage.js @@ -27,7 +27,7 @@ currentType = type; var promise1 = ApiClient.getServerConfiguration(); - var promise2 = $.getJSON(ApiClient.getUrl("System/Configuration/MetadataPlugins")); + var promise2 = ApiClient.getJSON(ApiClient.getUrl("System/Configuration/MetadataPlugins")); $.when(promise1, promise2).done(function (response1, response2) { @@ -46,7 +46,7 @@ } else { - $.getJSON(ApiClient.getUrl("System/Configuration/MetadataOptions/Default")).done(function (defaultConfig) { + ApiClient.getJSON(ApiClient.getUrl("System/Configuration/MetadataOptions/Default")).done(function (defaultConfig) { config = defaultConfig; @@ -510,7 +510,7 @@ } else { - $.getJSON(ApiClient.getUrl("System/Configuration/MetadataOptions/Default")).done(function (defaultOptions) { + ApiClient.getJSON(ApiClient.getUrl("System/Configuration/MetadataOptions/Default")).done(function (defaultOptions) { defaultOptions.ItemType = type; config.MetadataOptions.push(defaultOptions); diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index 8f46f20290..fa8a99c211 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -289,7 +289,7 @@ }); - $.ajax({ + ApiClient.ajax({ type: "POST", url: url, dataType: "json" @@ -320,7 +320,7 @@ Ids: $('.fldSelectedItemIds', page).val() || '' }); - $.ajax({ + ApiClient.ajax({ type: "POST", url: url diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index d5ed309bfd..ae1ebff070 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -83,7 +83,7 @@ Fields: "PrimaryImageAspectRatio" }); - $.getJSON(url).done(function (recommendations) { + ApiClient.getJSON(url).done(function (recommendations) { if (!recommendations.length) { diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js index 1ed1720aed..d6afe49dc3 100644 --- a/dashboard-ui/scripts/mypreferencesdisplay.js +++ b/dashboard-ui/scripts/mypreferencesdisplay.js @@ -37,7 +37,7 @@ Dashboard.hideLoadingMsg(); }); - $.getJSON(ApiClient.getUrl("Channels", { + ApiClient.getJSON(ApiClient.getUrl("Channels", { UserId: user.Id diff --git a/dashboard-ui/scripts/notificationsetting.js b/dashboard-ui/scripts/notificationsetting.js index 6d198d8ac2..c16a38322a 100644 --- a/dashboard-ui/scripts/notificationsetting.js +++ b/dashboard-ui/scripts/notificationsetting.js @@ -27,8 +27,8 @@ var promise1 = ApiClient.getUsers(); var promise2 = ApiClient.getServerConfiguration(); - var promise3 = $.getJSON(ApiClient.getUrl("Notifications/Types")); - var promise4 = $.getJSON(ApiClient.getUrl("Notifications/Services")); + var promise3 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types")); + var promise4 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Services")); $.when(promise1, promise2, promise3, promise4).done(function (response1, response2, response3, response4) { @@ -98,7 +98,7 @@ var type = getParameterByName('type'); var promise1 = ApiClient.getServerConfiguration(); - var promise2 = $.getJSON(ApiClient.getUrl("Notifications/Types")); + var promise2 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types")); $.when(promise1, promise2).done(function (response1, response2) { diff --git a/dashboard-ui/scripts/notificationsettings.js b/dashboard-ui/scripts/notificationsettings.js index ab3d6ccc5a..4087eb29e8 100644 --- a/dashboard-ui/scripts/notificationsettings.js +++ b/dashboard-ui/scripts/notificationsettings.js @@ -4,7 +4,7 @@ Dashboard.showLoadingMsg(); - $.getJSON(ApiClient.getUrl("Notifications/Types")).done(function (list) { + ApiClient.getJSON(ApiClient.getUrl("Notifications/Types")).done(function (list) { var html = '