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

add object assign polyfill

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-16 16:38:01 -04:00
parent 74505accb3
commit bd8391a61c
13 changed files with 145 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dashboard-ui/scripts/mediacontroller.js
View file

@ -38,7 +38,7 @@
NowPlayingItem: state.NowPlayingItem
};
info = $.extend(info, state.PlayState);
info = Object.assign(info, state.PlayState);
ApiClient.reportPlaybackStart(info);
@ -126,12 +126,11 @@
function showActivePlayerMenuInternal(playerInfo) {
var id = 'dlg' + new Date().getTime();
var html = '';
var style = "";
html += '<paper-dialog id="' + id + '" entry-animation="fade-in-animation" exit-animation="fade-out-animation" with-backdrop style="' + style + '">';
var dlg = document.createElement('paper-dialog');
dlg.setAttribute('with-backdrop', 'with-backdrop');
dlg.setAttribute('role', 'alertdialog');
html += '<h2>';
html += (playerInfo.deviceName || playerInfo.name);
@ -160,21 +159,19 @@
html += '<paper-button dialog-dismiss>' + Globalize.translate('ButtonCancel') + '</paper-button>';
html += '</div>';
html += '</paper-dialog>';
dlg.innerHTML = html;
$(document.body).append(html);
document.body.appendChild(dlg);
setTimeout(function () {
var dlg = document.getElementById(id);
$('.chkMirror', dlg).on('change', onMirrorChange);
dlg.querySelector('.chkMirror').addEventListener('change', onMirrorChange);
dlg.open();
// Has to be assigned a z-index after the call to .open()
$(dlg).on('iron-overlay-closed', function () {
$(this).remove();
dlg.addEventListener('iron-overlay-closed', function () {
dlg.parentNode.removeChild(dlg);
});
}, 100);
@ -1045,7 +1042,9 @@
document.addEventListener('headercreated', function () {
$('.btnCast').off('click', onCastButtonClicked).on('click', onCastButtonClicked);
var btnCast = document.querySelector('.viewMenuBar .btnCast');
btnCast.removeEventListener('click', onCastButtonClicked);
btnCast.addEventListener('click', onCastButtonClicked);
});
pageClassOn('pagebeforeshow', "page", function () {