diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-15 12:42:15 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-15 12:42:15 -0500 |
| commit | ae350c460a683799338a8178932a3e6a0fb259f1 (patch) | |
| tree | a8ba98232a99eee5880a726537873feaad9ff381 | |
| parent | 7ebe8063c721d4a3901c6217135e4f3a5da3f6ca (diff) | |
use local jquery/jquery mobile
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 23 |
2 files changed, 26 insertions, 5 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index a822aa576..4e44f156a 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -414,7 +414,7 @@ namespace MediaBrowser.WebDashboard.Api var files = new[] { - "http://code.jquery.com/mobile/1.3.2/jquery.mobile-1.3.2.min.css", + "thirdparty/jquerymobile-1.3.2/jquery.mobile-1.3.2.min.css", "thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css" + versionString, "css/all.css" + versionString }; @@ -440,8 +440,6 @@ namespace MediaBrowser.WebDashboard.Api var files = new[] { - "thirdparty/jquery.min.js", - "http://code.jquery.com/mobile/1.3.2/jquery.mobile-1.3.2.min.js", "scripts/all.js" + versionString, "thirdparty/jstree1.0/jquery.jstree.min.js" }; @@ -551,9 +549,11 @@ namespace MediaBrowser.WebDashboard.Api }; var memoryStream = new MemoryStream(); - var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine); + await AppendResource(memoryStream, "thirdparty/jquery-1.9.1.min.js", newLineBytes).ConfigureAwait(false); + await AppendResource(memoryStream, "thirdparty/jquerymobile-1.3.2/jquery.mobile-1.3.2.min.js", newLineBytes).ConfigureAwait(false); + var versionString = string.Format("window.dashboardVersion='{0}';", _appHost.ApplicationVersion); var versionBytes = Encoding.UTF8.GetBytes(versionString); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 028fbf715..a71096c33 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -412,7 +412,28 @@ <Content Include="dashboard-ui\thirdparty\autonumeric\autoNumeric.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="dashboard-ui\thirdparty\jquery.min.js">
+ <Content Include="dashboard-ui\thirdparty\jquery-1.9.1.min.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\jquerymobile-1.3.2\images\ajax-loader.gif">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\jquerymobile-1.3.2\images\icons-18-black.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\jquerymobile-1.3.2\images\icons-18-white.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\jquerymobile-1.3.2\images\icons-36-black.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\jquerymobile-1.3.2\images\icons-36-white.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\jquerymobile-1.3.2\jquery.mobile-1.3.2.min.css">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\jquerymobile-1.3.2\jquery.mobile-1.3.2.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\thirdparty\jstree1.0\jquery.jstree.min.js">
|
