diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-14 16:01:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-14 16:01:08 -0400 |
| commit | 0eb7ce6e4e4d04660954f2c6548a74c5a0c6aea8 (patch) | |
| tree | e2fb1d79047ce4d34a75c88fd5e6aa919cd2e7f3 | |
| parent | a9e65b93cccd0705aa3a3802c86dda09b9b38401 (diff) | |
| parent | 325a3cc844e338dfac2dd136aa49c05ad9517388 (diff) | |
Merge pull request #2057 from MediaBrowser/dev
Dev
| -rw-r--r-- | MediaBrowser.Controller/Entities/UserRootFolder.cs | 28 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 9 |
2 files changed, 23 insertions, 14 deletions
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs index a62c67c4f..d043cba47 100644 --- a/MediaBrowser.Controller/Entities/UserRootFolder.cs +++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs @@ -18,20 +18,20 @@ namespace MediaBrowser.Controller.Entities { private List<Guid> _childrenIds = null; private readonly object _childIdsLock = new object(); - //protected override IEnumerable<BaseItem> LoadChildren() - //{ - // lock (_childIdsLock) - // { - // if (_childrenIds == null) - // { - // var list = base.LoadChildren().ToList(); - // _childrenIds = list.Select(i => i.Id).ToList(); - // return list; - // } - - // return _childrenIds.Select(LibraryManager.GetItemById).Where(i => i != null).ToList(); - // } - //} + protected override IEnumerable<BaseItem> LoadChildren() + { + lock (_childIdsLock) + { + if (_childrenIds == null) + { + var list = base.LoadChildren().ToList(); + _childrenIds = list.Select(i => i.Id).ToList(); + return list; + } + + return _childrenIds.Select(LibraryManager.GetItemById).Where(i => i != null).ToList(); + } + } private void ResetCachedChildren() { diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index f1b234b90..9b51fd489 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -116,6 +116,12 @@ <Content Include="dashboard-ui\components\directorybrowser\directorybrowser.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</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">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -1557,6 +1563,9 @@ <None Include="dashboard-ui\manifest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="dashboard-ui\strings\be-BY.json">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="dashboard-ui\strings\fr-CA.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
|