aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.WebDashboard
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-14 15:03:35 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-14 15:03:35 -0500
commitf4b890f163cd3be5b399ef03be409106ab8ff60b (patch)
tree5142c6f6772b39582922d637a94f5953db9b0158 /MediaBrowser.WebDashboard
parent3cde2011904de6a874b17cab97fbc984ce62c228 (diff)
added new item by name filters
Diffstat (limited to 'MediaBrowser.WebDashboard')
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs1
-rw-r--r--MediaBrowser.WebDashboard/ApiClient.js31
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj3
-rw-r--r--MediaBrowser.WebDashboard/packages.config2
4 files changed, 3 insertions, 34 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 211a3028b9..93bf768e69 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -567,7 +567,6 @@ namespace MediaBrowser.WebDashboard.Api
await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.0/jquery.mobile-1.4.0.min.js", newLineBytes).ConfigureAwait(false);
//await AppendResource(memoryStream, "thirdparty/jquery.infinite-scroll-helper.min.js", newLineBytes).ConfigureAwait(false);
- await AppendResource(memoryStream, "thirdparty/jquery.hoverIntent.minified.js", newLineBytes).ConfigureAwait(false);
var versionString = string.Format("window.dashboardVersion='{0}';", _appHost.ApplicationVersion);
var versionBytes = Encoding.UTF8.GetBytes(versionString);
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index 578f711760..e790a1836c 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -378,20 +378,9 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
});
};
- self.getAuthorizedFeatures = function (options) {
+ self.getLiveTvInfo = function (options) {
- var url = self.getUrl("Users/AuthorizedFeatures", options || {});
-
- return self.ajax({
- type: "GET",
- url: url,
- dataType: "json"
- });
- };
-
- self.getLiveTvServices = function (options) {
-
- var url = self.getUrl("LiveTv/Services", options || {});
+ var url = self.getUrl("LiveTv/Info", options || {});
return self.ajax({
type: "GET",
@@ -2714,22 +2703,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
});
};
- self.updateLiveTvChannel = function (item) {
-
- if (!item) {
- throw new Error("null item");
- }
-
- var url = self.getUrl("LiveTv/Channels/" + item.Id);
-
- return self.ajax({
- type: "POST",
- url: url,
- data: JSON.stringify(item),
- contentType: "application/json"
- });
- };
-
self.updateArtist = function (item) {
if (!item) {
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 96a27c28d2..78164a5af7 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -496,9 +496,6 @@
<Content Include="dashboard-ui\thirdparty\jquery-2.0.3.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="dashboard-ui\thirdparty\jquery.hoverIntent.minified.js">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="dashboard-ui\thirdparty\jquery.infinite-scroll-helper.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 939ca9997a..56158ace7c 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="MediaBrowser.ApiClient.Javascript" version="3.0.228" targetFramework="net45" />
+ <package id="MediaBrowser.ApiClient.Javascript" version="3.0.230" targetFramework="net45" />
</packages> \ No newline at end of file