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

fixed for new collection creation

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-26 00:39:40 -04:00
parent 6902732194
commit e6615a1803
4 changed files with 41 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

29
dashboard-ui/mypreferenceswebclient.html
View file

@ -121,6 +121,35 @@
</select> </select>
</div> </div>
<br /> <br />
<div>
<label for="selectMaxChromecastBitrate">${LabelMaxChromecastBitrate}</label>
<select id="selectMaxChromecastBitrate" data-mini="true">
<option value="30000000">30Mbps</option>
<option value="25000000">25Mbps</option>
<option value="20000000">20Mbps</option>
<option value="15000000">15Mbps</option>
<option value="12000000">12Mbps</option>
<option value="11000000">11Mbps</option>
<option value="10000000">10Mbps</option>
<option value="9000000">9Mbps</option>
<option value="8000000">8Mbps</option>
<option value="7000000">7Mbps</option>
<option value="6000000">6Mbps</option>
<option value="5000000">5Mbps</option>
<option value="4000000">4Mbps</option>
<option value="3000000">3Mbps</option>
<option value="2500000">2.5Mbps</option>
<option value="2000000">2Mbps</option>
<option value="1500000">1.5Mbps</option>
<option value="1000000">1Mbps</option>
<option value="720000">720kbps</option>
<option value="420000">420kbps</option>
<option value="400000">400kbps</option>
<option value="320000">320kbps</option>
<option value="192000">192kbps</option>
</select>
</div>
<br />
<div> <div>
<label for="selectThemeSong">${LabelEnableThemeSongs}</label> <label for="selectThemeSong">${LabelEnableThemeSongs}</label>
<select id="selectThemeSong" data-mini="true"> <select id="selectThemeSong" data-mini="true">

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

@ -336,8 +336,7 @@
var player = this; var player = this;
var bitrateSetting = AppSettings.maxStreamingBitrate(); var bitrateSetting = AppSettings.maxChromecastBitrate();
bitrateSetting = Math.min(bitrateSetting, 10000000);
var receiverName = null; var receiverName = null;

2
dashboard-ui/scripts/moviecollections.js
View file

@ -400,7 +400,7 @@
// The button is created dynamically // The button is created dynamically
$(page).on('click', '.btnNewCollection', function () { $(page).on('click', '.btnNewCollection', function () {
showCollectionPanel(page, []); showCollectionPanel([]);
}); });
}); });

10
dashboard-ui/scripts/mypreferenceswebclient.js
View file

@ -5,6 +5,7 @@
var externalPlayers = JSON.parse(store.getItem('externalplayers') || '[]'); var externalPlayers = JSON.parse(store.getItem('externalplayers') || '[]');
$('#selectMaxBitrate', page).val(AppSettings.maxStreamingBitrate()).selectmenu("refresh"); $('#selectMaxBitrate', page).val(AppSettings.maxStreamingBitrate()).selectmenu("refresh");
$('#selectMaxChromecastBitrate', page).val(AppSettings.maxChromecastBitrate()).selectmenu("refresh");
$('.chkExternalPlayer', page).each(function () { $('.chkExternalPlayer', page).each(function () {
@ -66,6 +67,7 @@
store.setItem('externalplayers', JSON.stringify(externalPlayers)); store.setItem('externalplayers', JSON.stringify(externalPlayers));
AppSettings.maxStreamingBitrate($('#selectMaxBitrate', page).val()); AppSettings.maxStreamingBitrate($('#selectMaxBitrate', page).val());
AppSettings.maxChromecastBitrate($('#selectMaxChromecastBitrate', page).val());
var userId = getParameterByName('userId') || Dashboard.getCurrentUserId(); var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
@ -122,6 +124,14 @@
} }
return parseInt(store.getItem('preferredVideoBitrate') || '') || 1500000; return parseInt(store.getItem('preferredVideoBitrate') || '') || 1500000;
},
maxChromecastBitrate: function (val) {
if (val != null) {
store.setItem('chromecastBitrate', val);
}
return parseInt(store.getItem('chromecastBitrate') || '') || 3000000;
} }
}; };