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 now playing screen

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-18 01:06:06 -05:00
parent 6820da0e4f
commit 3ead8a75b4
8 changed files with 46 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.473",
"_release": "1.4.473",
"version": "1.4.474",
"_release": "1.4.474",
"_resolution": {
"type": "version",
"tag": "1.4.473",
"commit": "5480407d7cc7201e3310cb892c5d2779507d7240"
"tag": "1.4.474",
"commit": "6e74a88452ec9dee906696b042c969dcc1aee842"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

12
dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js vendored
View file

@ -971,6 +971,18 @@
});
};
self.getCurrentPlaylistIndex = function () {
return 0;
};
self.setCurrentPlaylistIndex = function (index) {
return Promise.resolve();
};
self.removeFromPlaylist = function (index) {
return Promise.resolve();
};
self.getPlayerState = function () {
return Promise.resolve(self.getPlayerStateInternal() || {});

2
dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css vendored
View file

@ -16,7 +16,7 @@ _:-ms-input-placeholder, :root .mdl-slider {
-ms-user-select: none;
user-select: none;
outline: 0;
padding: 1.5em 0;
padding: 1em 0;
color: #52B54B;
-webkit-align-self: center;
-ms-flex-item-align: center;

5
dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.css vendored
View file

@ -23,11 +23,10 @@
}
.itemSelectionCount {
font-size: 28px;
vertical-align: middle;
color: #fff;
display: inline-block;
padding-top: 1px;
opacity: 1 !important;
margin: 0;
}
.multiSelectCheckboxOutline {

4
dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.js vendored
View file

@ -126,10 +126,8 @@
var html = '';
html += '<div style="float:left;">';
html += '<button is="paper-icon-button-light" class="btnCloseSelectionPanel autoSize"><i class="md-icon">close</i></button>';
html += '<span class="itemSelectionCount"></span>';
html += '</div>';
html += '<h1 class="itemSelectionCount"></h1>';
var moreIcon = appHost.moreIcon === 'dots-horiz' ? '&#xE5D3;' : '&#xE5D4;';
html += '<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><i class="md-icon">' + moreIcon + '</i></button>';

12
dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js vendored
View file

@ -283,6 +283,18 @@
return state.MediaType === 'Audio';
};
self.getCurrentPlaylistIndex = function () {
return 0;
};
self.setCurrentPlaylistIndex = function (index) {
return Promise.resolve();
};
self.removeFromPlaylist = function (index) {
return Promise.resolve();
};
self.getPlayerState = function () {
var apiClient = getCurrentApiClient();

10
dashboard-ui/components/remotecontrol.js
View file

@ -540,13 +540,15 @@
});
}
function onPlaybackStopped(e, state) {
function onPlaybackStopped(e, stopInfo) {
console.log('remotecontrol event: ' + e.type);
var player = this;
updatePlayerState(dlg, {});
loadPlaylist(dlg);
if (!stopInfo.nextMediaType) {
updatePlayerState(dlg, {});
loadPlaylist(dlg);
}
}
function onPlayPauseStateChanged(e) {

12
dashboard-ui/css/nowplaying.css
View file

@ -17,7 +17,7 @@
}
.nowPlayingPositionSliderContainer {
margin: .7em 1em .7em;
margin: .7em 0 .7em 1em;
}
.nowPlayingInfoButtons {
@ -101,8 +101,7 @@
.nowPlayingPageImage {
width: auto;
max-width: 100%;
max-height: 36vh;
height: 40vh;
}
}
@ -120,7 +119,8 @@
@media all and (min-width: 800px) {
.nowPlayingSecondaryButtons {
margin-left: auto;
flex-grow: 1;
justify-content: flex-end;
}
}
@ -157,3 +157,7 @@
.nowPlayingCastIcon {
font-size: 86%;
}
.nowPlayingVolumeSliderContainer {
width: 6em;
}