lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #777 from timhobbs/master

Browse Source 
Cast updates and lazy loading
This commit is contained in:
Luke 2014-04-10 11:17:36 -04:00
commit efef76424e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -419,6 +419,7 @@ namespace MediaBrowser.WebDashboard.Api
{ {
"scripts/all.js" + versionString, "scripts/all.js" + versionString,
"thirdparty/jstree1.0/jquery.jstree.min.js", "thirdparty/jstree1.0/jquery.jstree.min.js",
"thirdparty/jquery.unveil-custom.js",
"https://www.gstatic.com/cv/js/sender/v1/cast_sender.js" "https://www.gstatic.com/cv/js/sender/v1/cast_sender.js"
}; };
@ -441,6 +442,7 @@ namespace MediaBrowser.WebDashboard.Api
// jQuery + jQuery mobile // jQuery + jQuery mobile
await AppendResource(memoryStream, "thirdparty/jquery-2.0.3.min.js", newLineBytes).ConfigureAwait(false); await AppendResource(memoryStream, "thirdparty/jquery-2.0.3.min.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.2/jquery.mobile-1.4.2.min.js", newLineBytes).ConfigureAwait(false); await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.2/jquery.mobile-1.4.2.min.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/jquery.ba-tinypubsub.min.js", newLineBytes).ConfigureAwait(false);
await AppendLocalization(memoryStream).ConfigureAwait(false); await AppendLocalization(memoryStream).ConfigureAwait(false);
await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false); await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -653,6 +653,12 @@
<Content Include="dashboard-ui\thirdparty\jquery-2.0.3.min.js"> <Content Include="dashboard-ui\thirdparty\jquery-2.0.3.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\thirdparty\jquery.ba-tinypubsub.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\thirdparty\jquery.unveil-custom.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\ajax-loader.gif"> <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\ajax-loader.gif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>