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

adjust external player label

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-26 15:53:12 -04:00
parent f19a485f12
commit 670d654af8
9 changed files with 64 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/css/card.css
View file

@ -51,6 +51,10 @@
margin: 8px; margin: 8px;
} }
.mediumCardMargin .cardBox {
margin: 4px;
}
/*@media all and (max-width: 600px) { /*@media all and (max-width: 600px) {
.cardBox { .cardBox {

2
dashboard-ui/livetvguide.html
View file

@ -32,7 +32,7 @@
</div> </div>
<div class="channelPaging"></div> <div class="channelPaging"></div>
</div> </div>
<div class="guideRequiresUnlock readOnlyContent" style="margin:2em auto;text-align:center;display:none;"> <div class="guideRequiresUnlock readOnlyContent" style="margin:1em auto;text-align:center;display:none;padding:1em;">
<p class="unlockText"></p> <p class="unlockText"></p>
<button class="btn btnActionAccent btnUnlockGuide" data-role="none" type="button"> <button class="btn btnActionAccent btnUnlockGuide" data-role="none" type="button">
<span> <span>

3
dashboard-ui/mypreferenceswebclient.html
View file

@ -178,7 +178,8 @@
<input type="checkbox" id="chkExternalVideoPlayer" /> <input type="checkbox" id="chkExternalVideoPlayer" />
<label for="chkExternalVideoPlayer">${OptionEnableExternalVideoPlayers}</label> <label for="chkExternalVideoPlayer">${OptionEnableExternalVideoPlayers}</label>
</fieldset> </fieldset>
<div style="padding: 0 2px;">${LabelExternalPlayersHelp}</div> <div style="padding: 0 2px;display:none;" class="labelGenericExternalPlayers">${LabelExternalPlayersHelp}</div>
<div style="padding: 0 2px;display:none;" class="labelNativeExternalPlayers">${LabelNativeExternalPlayersHelp}</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -784,6 +784,7 @@
return; return;
} }
if (AppSettings.enableItemPreviews()) {
showItemsOverlay({ showItemsOverlay({
ids: [itemId], ids: [itemId],
context: context context: context
@ -791,6 +792,7 @@
return false; return false;
} }
}
$.fn.createCardMenus = function (options) { $.fn.createCardMenus = function (options) {

2
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -1109,7 +1109,7 @@
// Can't autoplay in these browsers so we need to use the full controls // Can't autoplay in these browsers so we need to use the full controls
if (requiresNativeControls) { if (requiresNativeControls) {
html += '<video class="itemVideo" id="itemVideo" preload="metadata" autoplay="autoplay" crossorigin="anonymous" controls="controls"' + posterCode + '>'; html += '<video class="itemVideo" id="itemVideo" preload="metadata" autoplay="autoplay" crossorigin="anonymous" controls="controls"' + posterCode + ' webkit-playsinline>';
} }
else { else {

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

@ -61,11 +61,7 @@
return false; return false;
} }
$(document).on('pageinit', "#webClientPreferencesPage", function () { $(document).on('pageshowready', "#webClientPreferencesPage", function () {
var page = this;
}).on('pagebeforeshow', "#webClientPreferencesPage", function () {
var page = this; var page = this;
@ -86,6 +82,14 @@
} else { } else {
$('.homePageConfigurationSection', page).show(); $('.homePageConfigurationSection', page).show();
} }
if (AppInfo.hasKnownExternalPlayerSupport) {
$('.labelNativeExternalPlayers', page).show();
$('.labelGenericExternalPlayers', page).hide();
} else {
$('.labelGenericExternalPlayers', page).show();
$('.labelNativeExternalPlayers', page).hide();
}
}); });
window.WebClientPreferencesPage = { window.WebClientPreferencesPage = {
@ -121,6 +125,14 @@
} }
return store.getItem('externalplayers') == 'true'; return store.getItem('externalplayers') == 'true';
},
enableItemPreviews: function (val) {
if (val != null) {
store.setItem('enableItemPreviews', val.toString());
}
return store.getItem('enableItemPreviews') != 'false';
} }
}; };

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

@ -1386,7 +1386,7 @@ var Dashboard = {
// The native app can handle a little bit more than safari // The native app can handle a little bit more than safari
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
quality -= 15; quality -= 20;
if (isBackdrop) { if (isBackdrop) {
quality -= 20; quality -= 20;
@ -1549,12 +1549,13 @@ var AppInfo = {};
if (isCordova) { if (isCordova) {
AppInfo.enableBottomTabs = true; AppInfo.enableBottomTabs = true;
AppInfo.cardMargin = 'mediumCardMargin';
} else { } else {
AppInfo.enableDetailPageChapters = false; AppInfo.enableDetailPageChapters = false;
AppInfo.enableDetailsMenuImages = false; AppInfo.enableDetailsMenuImages = false;
AppInfo.enableHeaderImages = false; AppInfo.enableHeaderImages = false;
AppInfo.enableMovieHomeSuggestions = false; AppInfo.enableMovieHomeSuggestions = false;
AppInfo.enableLargeCardMargin = true; AppInfo.cardMargin = 'largeCardMargin';
} }
} }
else { else {
@ -1577,6 +1578,7 @@ var AppInfo = {};
if (isCordova) { if (isCordova) {
AppInfo.enableAppLayouts = true; AppInfo.enableAppLayouts = true;
AppInfo.hasKnownExternalPlayerSupport = true;
} }
else { else {
AppInfo.enableFooterNotifications = true; AppInfo.enableFooterNotifications = true;
@ -1670,8 +1672,8 @@ var AppInfo = {};
initFastClick(); initFastClick();
} }
if (AppInfo.enableLargeCardMargin) { if (AppInfo.cardMargin) {
$(document.body).addClass('largeCardMargin'); $(document.body).addClass(AppInfo.cardMargin);
} }
if (!AppInfo.enableLatestChannelItems) { if (!AppInfo.enableLatestChannelItems) {

2
dashboard-ui/thirdparty/cordova/registrationservices.js vendored
View file

@ -197,7 +197,7 @@
$('.btnSignInSupporter', elem).on('click', function () { $('.btnSignInSupporter', elem).on('click', function () {
Dashboard.alert({ Dashboard.alert({
message: 'MessagePleaseSignInLocalNetwork', message: Globalize.translate('MessagePleaseSignInLocalNetwork'),
callback: function () { callback: function () {
cancelInAppPurchase(); cancelInAppPurchase();
Dashboard.logout(); Dashboard.logout();

36
dashboard-ui/thirdparty/cordova/serverdiscovery.js vendored
View file

@ -23,6 +23,15 @@
return result; return result;
} }
function closeSocket(socketId) {
try {
chrome.sockets.udp.close(socketId);
} catch (err) {
}
}
function findServersInternal(timeoutMs) { function findServersInternal(timeoutMs) {
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
@ -54,7 +63,7 @@
if (socketId) { if (socketId) {
chrome.sockets.udp.onReceive.removeListener(onReceive); chrome.sockets.udp.onReceive.removeListener(onReceive);
chrome.sockets.udp.close(socketId); closeSocket(socketId);
} }
}, timeoutMs); }, timeoutMs);
@ -62,13 +71,13 @@
function onReceive(info) { function onReceive(info) {
try {
console.log('ServerDiscovery message received'); console.log('ServerDiscovery message received');
console.log(info); console.log(info);
if (info.socketId == socketId) { if (info != null && info.socketId == socketId) {
try {
var json = arrayBufferToString(info.data); var json = arrayBufferToString(info.data);
console.log('Server discovery json: ' + json); console.log('Server discovery json: ' + json);
var server = JSON.parse(json); var server = JSON.parse(json);
@ -80,11 +89,12 @@
} }
servers.push(server); servers.push(server);
}
} catch (err) { } catch (err) {
console.log('Error receiving server info: ' + err); console.log('Error receiving server info: ' + err);
} }
} }
}
var port = 7359; var port = 7359;
console.log('chrome.sockets.udp.create'); console.log('chrome.sockets.udp.create');
@ -105,24 +115,24 @@
console.log('chrome.sockets.udp.bind'); console.log('chrome.sockets.udp.bind');
chrome.sockets.udp.bind(createInfo.socketId, '0.0.0.0', 0, function (result) { chrome.sockets.udp.bind(createInfo.socketId, '0.0.0.0', 0, function (bindResult) {
if (getResultCode(result) != 0) { if (getResultCode(bindResult) != 0) {
console.log('bind fail: ' + result); console.log('bind fail: ' + bindResult);
deferred.resolveWith(null, [servers]); deferred.resolveWith(null, [servers]);
chrome.sockets.udp.close(createInfo.socketId); closeSocket(createInfo.socketId);
return; return;
} }
var data = stringToArrayBuffer('who is EmbyServer?'); var data = stringToArrayBuffer('who is EmbyServer?');
console.log('chrome.sockets.udp.send'); console.log('chrome.sockets.udp.send');
chrome.sockets.udp.send(createInfo.socketId, data, '255.255.255.255', port, function (result) { chrome.sockets.udp.send(createInfo.socketId, data, '255.255.255.255', port, function (sendResult) {
if (getResultCode(result) != 0) { if (getResultCode(sendResult) != 0) {
console.log('send fail: ' + result); console.log('send fail: ' + sendResult);
deferred.resolveWith(null, [servers]); deferred.resolveWith(null, [servers]);
chrome.sockets.udp.close(createInfo.socketId); closeSocket(createInfo.socketId);
} else { } else {