mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #2426 from MediaBrowser/beta

Browse source 
Beta
This commit is contained in:
Luke 2017-01-26 23:01:32 -05:00 • committed by GitHub
commit fa61f29160
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html
View file

@ -7,10 +7,10 @@
<div class="fieldDescription checkboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div> <div class="fieldDescription checkboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
</div> </div>
<div class="selectContainer fldMetadataLanguage hide" style="margin-top:3em;"> <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>
<div class="selectContainer fldMetadataCountry hide"> <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>
<div class="checkboxContainer checkboxContainer-withDescription chkSaveLocalContainer hide"> <div class="checkboxContainer checkboxContainer-withDescription chkSaveLocalContainer hide">
<label> <label>

16
dashboard-ui/scripts/editorsidebar.js
View file

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