Merge pull request #2426 from MediaBrowser/beta

Beta
MediaBrowser · Jan 27, 2017 · 11bffb3 · 11bffb3
2 parents e3c4bea + ae47fac
commit 11bffb3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -2737,16 +2737,18 @@ protected string GetInputModifier(StreamState state, bool genPts = true)
 
         private string GetDecoderFromCodec(string codec)
         {
-            if (string.Equals(codec, "mp2", StringComparison.OrdinalIgnoreCase))
-            {
-                return null;
-            }
-            if (string.Equals(codec, "aac_latm", StringComparison.OrdinalIgnoreCase))
-            {
-                return null;
-            }
+            return null;
+
+            //if (string.Equals(codec, "mp2", StringComparison.OrdinalIgnoreCase))
+            //{
+            //    return null;
+            //}
+            //if (string.Equals(codec, "aac_latm", StringComparison.OrdinalIgnoreCase))
+            //{
+            //    return null;
+            //}
 
-            return codec;
+            //return codec;
         }
 
         /// <summary>

diff --git a/...Dashboard/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html b/...Dashboard/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -7,10 +7,10 @@
     <div class="fieldDescription checkboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
 </div>
 <div class="selectContainer fldMetadataLanguage hide" style="margin-top:3em;">
-    <select is="emby-select" id="selectLanguage" label="${LabelMetadataDownloadLanguage}" required="required"></select>
+    <select is="emby-select" id="selectLanguage" label="${LabelMetadataDownloadLanguage}"></select>
 </div>
 <div class="selectContainer fldMetadataCountry hide">
-    <select is="emby-select" id="selectCountry" label="${LabelCountry}" required="required"></select>
+    <select is="emby-select" id="selectCountry" label="${LabelCountry}"></select>
 </div>
 <div class="checkboxContainer checkboxContainer-withDescription chkSaveLocalContainer hide">
     <label>

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/editorsidebar.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/editorsidebar.js
@@ -280,13 +280,17 @@
             collectionType: node.li_attr.collectiontype
         };
 
-        if (eventData.itemType != 'livetv' && eventData.itemType != 'mediafolders' && eventData.serverItemType != 'UserView' && eventData.serverItemType != 'CollectionFolder' && !eventData.collectionType) {
-
-            this.dispatchEvent(new CustomEvent('itemclicked', {
-                detail: eventData,
-                bubbles: true,
-                cancelable: false
-            }));
+        if (eventData.itemType != 'livetv' && eventData.itemType != 'mediafolders') {
+
+            // We'd like to prevent these from being editable but this removes the ability to perform a top level refresh
+            //if (eventData.serverItemType != 'UserView' && eventData.serverItemType != 'CollectionFolder' && !eventData.collectionType)
+            {
+                this.dispatchEvent(new CustomEvent('itemclicked', {
+                    detail: eventData,
+                    bubbles: true,
+                    cancelable: false
+                }));
+            }
         }
     }