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

update connect

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-04 16:27:46 -04:00
parent 2f83f86ee8
commit c7da2478bb
21 changed files with 72 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
dashboard-ui/css/images/clients/chromecast.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@ -691,14 +691,13 @@
}
if (clientLowered == "chromecast") {
return "<img src='css/images/chromecast/ic_media_route_on_holo_light.png' />";
return "<img src='css/images/clients/chromecast.png' />";
}
if (clientLowered == "chrome companion") {
return "<img src='css/images/clients/chrome_companion.png' />";
}
return null;
},

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

@ -15,7 +15,7 @@
}
function enableScrollX() {
return AppInfo.isTouchPreferred && AppInfo.enableAppLayouts;
return $.browser.mobile && AppInfo.enableAppLayouts;
}
function getThumbShape() {

5
dashboard-ui/scripts/librarybrowser.js
View file

@ -812,7 +812,8 @@
textlines.push(displayName);
var verticalTextLines = 2;
var enableSubLinks = !AppInfo.isTouchPreferred;
var enableSubLinks = !$.browser.mobile;
;
if (item.Type == 'Audio') {
textlines.push(item.ArtistItems.map(function (a) {
@ -1053,7 +1054,7 @@
var shapeWidth = screenWidth / imagesPerRow[currentShape];
if (!AppInfo.isTouchPreferred) {
if (!$.browser.mobile) {
shapeWidth = Math.round(shapeWidth / roundTo) * roundTo;
}

5
dashboard-ui/scripts/librarymenu.js
View file

@ -155,9 +155,12 @@
html += Globalize.translate('HeaderAdmin');
html += '</div>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="dashboard" href="dashboard.html"><span class="fa fa-server sidebarLinkIcon"></span>' + Globalize.translate('ButtonManageServer') + '</a>';
html += '<a class="sidebarLink lnkMediaFolder editorViewMenu" data-itemid="editor" href="edititemmetadata.html"><span class="fa fa-edit sidebarLinkIcon"></span>' + Globalize.translate('ButtonMetadataManager') + '</a>';
if (!$.browser.mobile && !AppInfo.isTouchPreferred) {
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="reports" href="reports.html"><span class="fa fa-bar-chart sidebarLinkIcon"></span>' + Globalize.translate('ButtonReports') + '</a>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="dashboard" href="dashboard.html"><span class="fa fa-server sidebarLinkIcon"></span>' + Globalize.translate('ButtonServer') + '</a>';
}
html += '</div>';
html += '<div class="sidebarDivider"></div>';

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

@ -11,7 +11,7 @@
}
function enableScrollX() {
return AppInfo.isTouchPreferred && AppInfo.enableAppLayouts;
return $.browser.mobile && AppInfo.enableAppLayouts;
}
function getPortraitShape() {

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

@ -8,7 +8,7 @@
}
function enableScrollX() {
return AppInfo.isTouchPreferred && AppInfo.enableAppLayouts;
return $.browser.mobile && AppInfo.enableAppLayouts;
}
function getSquareShape() {

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

@ -91,8 +91,7 @@
showTitle: true,
coverImage: true,
centerImage: true,
textLines: getAdditionalTextLines,
cardLayout: true
textLines: getAdditionalTextLines
});
$('.itemsContainer', elem).html(html).lazyChildren();
}

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

@ -1536,17 +1536,22 @@ var AppInfo = {};
if (isMobile) {
AppInfo.hasLowImageBandwidth = true;
AppInfo.forcedImageFormat = 'jpg';
}
if (isCordova) {
AppInfo.enableBottomTabs = true;
AppInfo.cardMargin = 'mediumCardMargin';
} else {
if (isMobile) {
AppInfo.enableDetailPageChapters = false;
AppInfo.enableDetailsMenuImages = false;
AppInfo.enableMovieHomeSuggestions = false;
AppInfo.cardMargin = 'largeCardMargin';
AppInfo.forcedImageFormat = 'jpg';
}
}
}
else {
@ -1832,7 +1837,7 @@ var AppInfo = {};
}
if ($.browser.safari) {
requirejs(['thirdparty/cordova/remotecontrols']);
requirejs(['thirdparty/cordova/remotecontrols', 'thirdparty/cordova/ios/orientation']);
}
} else {

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

@ -106,7 +106,7 @@
}
function enableScrollX() {
return AppInfo.isTouchPreferred && AppInfo.enableAppLayouts;
return $.browser.mobile && AppInfo.enableAppLayouts;
}
function getThumbShape() {

8
dashboard-ui/thirdparty/apiclient/apiclient.js vendored
View file

@ -372,11 +372,15 @@
throw new Error('connectionMode cannot be null');
}
logger.log('Begin updateServerInfo');
logger.log('Begin updateServerInfo. connectionMode: ' + connectionMode);
self.serverInfo(server);
var serverUrl = MediaBrowser.ServerInfo.getServerAddress(connectionMode);
var serverUrl = MediaBrowser.ServerInfo.getServerAddress(server, connectionMode);
if (!serverUrl) {
throw new Error('serverUrl cannot be null. serverInfo: ' + JSON.stringify(server));
}
logger.log('Setting server address to ' + serverUrl);
self.serverAddress(serverUrl);
};

2
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -769,7 +769,7 @@
} else {
var firstServer = servers[0];
var firstServer = servers.length ? servers[0] : null;
// See if we have any saved credentials and can auto sign in
if (firstServer) {
self.connectToServer(firstServer).done(function (result) {

3
dashboard-ui/thirdparty/apiclient/credentials.js vendored
View file

@ -75,6 +75,9 @@
if (server.RemoteAddress) {
existing.RemoteAddress = server.RemoteAddress;
}
if (server.ManualAddress) {
existing.ManualAddress = server.ManualAddress;
}
if (server.LocalAddress) {
existing.LocalAddress = server.LocalAddress;
}

3
dashboard-ui/thirdparty/cordova/android/immersive.js vendored
View file

@ -48,9 +48,12 @@
var player = this;
if (player.isLocalPlayer && state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
if (!AppSettings.enableFullScreen()) {
AndroidFullScreen.showSystemUI(onSuccess, onError);
}
}
}
function bindToPlayer(player) {

3
dashboard-ui/thirdparty/cordova/chromecast.js vendored
View file

@ -604,6 +604,9 @@
console.log('Will attempt to connect to Chromecast');
Dashboard.showModalLoadingMsg();
setTimeout(Dashboard.hideModalLoadingMsg, 3000);
if (device.isReady()) {
console.log('Device is already ready, calling onDeviceReady');
onDeviceReady(device);

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

@ -5,7 +5,7 @@
var manager = ConnectSDK.discoveryManager;
//manager.setPairingLevel(ConnectSDK.PairingLevel.OFF);
//manager.setAirPlayServiceMode(ConnectSDK.AirPlayServiceMode.Media);
manager.setAirPlayServiceMode(ConnectSDK.AirPlayServiceMode.Media);
// Show devices that support playing videos and pausing
//manager.setCapabilityFilters([

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

@ -88,12 +88,10 @@
// show some logs and finish the transaction.
store.when(unlockAppProductId).approved(function (order) {
log('You just unlocked the FULL VERSION!');
alert('approved');
order.finish();
});
store.when(unlockAppProductId).verified(function (p) {
alert('verified');
log("verified");
p.finish();
});

21
dashboard-ui/thirdparty/cordova/ios/orientation.js vendored Normal file
View file

@ -0,0 +1,21 @@
(function () {
function forceScroll() {
var doc = $(document);
// Try to make it react quicker to the orientation change
doc.scrollTop(doc.scrollTop() + 1);
}
function onOrientationChange() {
forceScroll();
for (var i = 0; i <= 500; i += 100) {
setTimeout(forceScroll, i);
}
}
$(window).on('orientationchange', onOrientationChange);
})();

4
dashboard-ui/thirdparty/cordova/remotecontrols.js vendored
View file

@ -21,8 +21,8 @@
var artist = parts.length == 1 ? '' : parts[0];
var title = parts[parts.length - 1];
var album = state.NowPlayingItem || '';
var duration = state.NowPlayingItem.RunTimeTicks ? (state.NowPlayingItem / 10000000) : 0;
var album = state.NowPlayingItem.Album || '';
var duration = state.NowPlayingItem.RunTimeTicks ? (state.NowPlayingItem.RunTimeTicks / 10000000) : 0;
var elapsedTime = playState.PositionTicks ? (playState.PositionTicks / 10000000) : 0;
var url = '';

4
dashboard-ui/thirdparty/velocity.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

3
dashboard-ui/voice/voice.css
View file

@ -8,7 +8,8 @@
background-position: center center;
background-size: 100% 100%;
background-repeat: no-repeat;
z-index: 999999;
/* Need to make sure it is on top of content but underneath slideout panels */
z-index: 1097;
}
.voiceInputHelpInner {