Merge pull request #2057 from MediaBrowser/dev

Dev

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()
         {

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>