diff options
| author | Luke <luke.pulverenti@gmail.com> | 2014-04-10 11:17:36 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2014-04-10 11:17:36 -0400 |
| commit | efef76424e6db71b139a13a51f56f043902b31de (patch) | |
| tree | 192731f5ac51dd8289a7ef45decf11636e6a41ce | |
| parent | 3094868a83937d2f5c49b06abd53757ef304a7e2 (diff) | |
| parent | 4b206b9cac8fb3e34989aaa442a9389537c61d11 (diff) | |
Merge pull request #777 from timhobbs/master
Cast updates and lazy loading
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 6252a0346..7ab489450 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -419,6 +419,7 @@ namespace MediaBrowser.WebDashboard.Api { "scripts/all.js" + versionString, "thirdparty/jstree1.0/jquery.jstree.min.js", + "thirdparty/jquery.unveil-custom.js", "https://www.gstatic.com/cv/js/sender/v1/cast_sender.js" }; @@ -441,6 +442,7 @@ namespace MediaBrowser.WebDashboard.Api // jQuery + jQuery mobile 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/jquery.ba-tinypubsub.min.js", newLineBytes).ConfigureAwait(false); await AppendLocalization(memoryStream).ConfigureAwait(false); await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 0ddb05577..94265501c 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -653,6 +653,12 @@ <Content Include="dashboard-ui\thirdparty\jquery-2.0.3.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</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">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
|