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

Merge pull request #2057 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-08-14 16:01:08 -04:00 committed by GitHub
commit 0eb7ce6e4e
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MediaBrowser.Controller/Entities/UserRootFolder.cs
View File

@ -18,20 +18,20 @@ namespace MediaBrowser.Controller.Entities
{ {
private List<Guid> _childrenIds = null; private List<Guid> _childrenIds = null;
private readonly object _childIdsLock = new object(); private readonly object _childIdsLock = new object();
//protected override IEnumerable<BaseItem> LoadChildren() protected override IEnumerable<BaseItem> LoadChildren()
//{ {
// lock (_childIdsLock) lock (_childIdsLock)
// { {
// if (_childrenIds == null) if (_childrenIds == null)
// { {
// var list = base.LoadChildren().ToList(); var list = base.LoadChildren().ToList();
// _childrenIds = list.Select(i => i.Id).ToList(); _childrenIds = list.Select(i => i.Id).ToList();
// return list; return list;
// } }
// return _childrenIds.Select(LibraryManager.GetItemById).Where(i => i != null).ToList(); return _childrenIds.Select(LibraryManager.GetItemById).Where(i => i != null).ToList();
// } }
//} }
private void ResetCachedChildren() private void ResetCachedChildren()
{ {

9
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -116,6 +116,12 @@
<Content Include="dashboard-ui\components\directorybrowser\directorybrowser.css"> <Content Include="dashboard-ui\components\directorybrowser\directorybrowser.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\components\dockedtabs\dockedtabs.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\dockedtabs\dockedtabs.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\favoriteitems.js"> <Content Include="dashboard-ui\components\favoriteitems.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -1557,6 +1563,9 @@
<None Include="dashboard-ui\manifest.json"> <None Include="dashboard-ui\manifest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="dashboard-ui\strings\be-BY.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="dashboard-ui\strings\fr-CA.json"> <None Include="dashboard-ui\strings\fr-CA.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>