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 branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source
This commit is contained in:
Luke Pulverenti 2013-04-03 08:03:46 -04:00
commit 74f189d86d
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/library.html
View file

@ -20,8 +20,7 @@
<label for="chkUseDefaultLibrary">Use default media library</label> <label for="chkUseDefaultLibrary">Use default media library</label>
</p> </p>
<div id="divMediaLibrary"> <div id="divMediaLibrary">
<p>Below are your media collections. Expand a collection to add or remove media locations assigned to it.</p> <p class="editing_default">This is the <strong>default media library</strong> that will be shared with all users unless they setup their own.</p>
<p class="editing_default">This is the <strong>default media library</strong> that will be shared with all users unless they setup their own.</p>
<p> <p>
<button type="button" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button> <button type="button" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
</p> </p>

3
dashboard-ui/scripts/medialibrarypage.js
View file

@ -29,6 +29,7 @@
if (user.Configuration.UseCustomLibrary) { if (user.Configuration.UseCustomLibrary) {
ApiClient.getVirtualFolders(userId).done(MediaLibraryPage.reloadVirtualFolders); ApiClient.getVirtualFolders(userId).done(MediaLibraryPage.reloadVirtualFolders);
$(".editing_default").hide();
$('#divMediaLibrary', page).show(); $('#divMediaLibrary', page).show();
} else { } else {
$('#divMediaLibrary', page).hide(); $('#divMediaLibrary', page).hide();
@ -118,6 +119,8 @@
user.Configuration.UseCustomLibrary = !useDefaultLibrary; user.Configuration.UseCustomLibrary = !useDefaultLibrary;
ApiClient.updateUser(user).done(MediaLibraryPage.reloadLibrary); ApiClient.updateUser(user).done(MediaLibraryPage.reloadLibrary);
$(".editing_default").hide();
}); });
}, },

4
dashboard-ui/scripts/mediaplayer.js
View file

@ -145,16 +145,18 @@
audioCodec: 'Vorbis' audioCodec: 'Vorbis'
})); }));
/* ffmpeg always says the ogg stream is corrupt after conversion
var oggUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.oga', $.extend({}, baseParams, { var oggUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.oga', $.extend({}, baseParams, {
audioCodec: 'Vorbis' audioCodec: 'Vorbis'
})); }));
*/
var html = ''; var html = '';
html += '<audio class="itemAudio" preload="none" controls autoplay>'; html += '<audio class="itemAudio" preload="none" controls autoplay>';
html += '<source type="audio/mpeg" src="' + mp3Url + '" />'; html += '<source type="audio/mpeg" src="' + mp3Url + '" />';
html += '<source type="audio/aac" src="' + aacUrl + '" />'; html += '<source type="audio/aac" src="' + aacUrl + '" />';
html += '<source type="audio/webm" src="' + webmUrl + '" />'; html += '<source type="audio/webm" src="' + webmUrl + '" />';
html += '<source type="audio/ogg" src="' + oggUrl + '" />'; //html += '<source type="audio/ogg" src="' + oggUrl + '" />';
html += '</audio'; html += '</audio';
var nowPlayingBar = $('#nowPlayingBar').show(); var nowPlayingBar = $('#nowPlayingBar').show();

2
dashboard-ui/wizardlibrary.html
View file

@ -17,7 +17,7 @@
<label for="chkUseDefaultLibrary">Use default media library</label> <label for="chkUseDefaultLibrary">Use default media library</label>
</p> </p>
<div id="divMediaLibrary"> <div id="divMediaLibrary">
<p>Below are your media collections. Expand a collection to add or remove media locations assigned to it.</p> <p class="editing_default">This is the <strong>default media library</strong> that will be shared with all users unless they setup their own.</p>
<p> <p>
<button type="button" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button> <button type="button" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
</p> </p>