update to jstree 3.0.8

3 files changed, 9 insertions, 10 deletions

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index a14a8ad08..bbf1d8e3a 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -71,7 +71,8 @@ namespace MediaBrowser.Server.Implementations.Dto
         {
             var options = new DtoOptions
             {
-                Fields = fields
+                Fields = fields,
+                EnableSettings = true
             };
 
             // Get everything
@@ -676,7 +677,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.IsUnidentified = item.IsUnidentified;
             }
 
-            if (fields.Contains(ItemFields.Settings))
+            if (options.EnableSettings)
             {
                 dto.LockedFields = item.LockedFields;
                 dto.LockData = item.IsLocked;
@@ -1169,7 +1170,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 dto.SeasonCount = series.SeasonCount;
 
-                if (fields.Contains(ItemFields.Settings))
+                if (options.EnableSettings)
                 {
                     dto.DisplaySpecialsWithSeasons = series.DisplaySpecialsWithSeasons;
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index d61a00ac3..9647461bf 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1563,14 +1563,11 @@ namespace MediaBrowser.Server.Implementations.Library
                 return null;
             }
 
-            var collectionTypes = GetUserRootFolder().Children
+            return GetUserRootFolder().Children
                 .OfType<ICollectionFolder>()
-                .Where(i => !string.IsNullOrEmpty(i.CollectionType) && (string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase) || i.PhysicalLocations.Contains(item.Path)))
+                .Where(i => string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase) || i.PhysicalLocations.Contains(item.Path))
                 .Select(i => i.CollectionType)
-                .Distinct()
-                .ToList();
-
-            return collectionTypes.Count == 1 ? collectionTypes[0] : null;
+                .FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
         }
 
         public async Task<UserView> GetNamedView(string name,
@@ -1717,7 +1714,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 new Naming.Logging.NullLogger());
 
             var locationType = episode.LocationType;
-            
+
             var fileType = /*args.IsDirectory ? FileInfoType.Directory :*/ FileInfoType.File;
             var episodeInfo = locationType == LocationType.FileSystem || locationType == LocationType.Offline ?
                 resolver.Resolve(episode.Path, fileType) :
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 7072f2406..695200239 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -402,6 +402,7 @@
     "LabelYear": "Year:",
     "LabelDateOfBirth": "Date of birth:",
     "LabelBirthYear": "Birth year:",
+    "LabelBirthDate": "Birth date:",
     "LabelDeathDate": "Death date:",
     "HeaderRemoveMediaLocation": "Remove Media Location",
     "MessageConfirmRemoveMediaLocation": "Are you sure you wish to remove this location?",