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

fix recording button

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-23 18:13:06 -04:00
parent 02b433a97f
commit c73ed976d9
30 changed files with 165 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dashboard-ui/cordova/android/mediasession.js vendored
View file

@ -13,6 +13,13 @@
return;
}
var isLocalPlayer = MediaController.getPlayerInfo().isLocalPlayer || false;
// Local players do their own notifications
if (isLocalPlayer) {
return;
}
// dummy this up
if (eventName == 'init') {
eventName = 'positionchange';
@ -28,10 +35,12 @@
var artist = parts.length == 1 ? '' : parts[0];
var title = parts[parts.length - 1];
var album = state.NowPlayingItem.Album || '';
var duration = state.NowPlayingItem.RunTimeTicks ? (state.NowPlayingItem.RunTimeTicks / 10000000) : 0;
var position = playState.PositionTicks ? (playState.PositionTicks / 10000000) : 0;
var itemId = state.NowPlayingItem.Id;
// Convert to ms
var duration = state.NowPlayingItem.RunTimeTicks ? (state.NowPlayingItem.RunTimeTicks / 10000) : 0;
var position = playState.PositionTicks ? (playState.PositionTicks / 10000) : 0;
var isPaused = playState.IsPaused || false;
var canSeek = playState.CanSeek || false;
@ -75,8 +84,6 @@
}
}
var isLocalPlayer = MediaController.getPlayerInfo().isLocalPlayer || false;
MainActivity.updateMediaSession(eventName, isLocalPlayer, itemId, title, artist, album, parseInt(duration), parseInt(position), url, canSeek, isPaused);
lastUpdateTime = new Date().getTime();
}

7
dashboard-ui/cordova/android/vlcplayer.js vendored
View file

@ -88,7 +88,7 @@
}
};
self.setCurrentSrc = function (val) {
self.setCurrentSrc = function (val, item, mediaSource) {
if (!val) {
self.destroy();
@ -96,7 +96,8 @@
}
if (type == 'audio') {
AndroidVlcPlayer.playAudioVlc(val);
AndroidVlcPlayer.playAudioVlc(val, JSON.stringify(item), JSON.stringify(mediaSource), posterUrl);
} else {
AndroidVlcPlayer.playVideoVlc(val);
}
@ -125,7 +126,9 @@
playerState = {};
};
var posterUrl;
self.setPoster = function (url) {
posterUrl = url;
};
self.report = function (eventName, duration, position, isPaused, volume) {

13
dashboard-ui/cordova/registrationservices.js vendored
View file

@ -86,6 +86,7 @@
function getInAppPurchaseElement(info) {
require(['paperbuttonstyle']);
cancelInAppPurchase();
var html = '';
@ -125,14 +126,20 @@
if (info.price) {
unlockText = Globalize.translate('ButtonUnlockPrice', info.price);
}
html += '<button class="btn btnActionAccent btnAppUnlock" data-role="none" type="button"><span>' + unlockText + '</span><i class="fa fa-check"></i></button>';
html += '<p>';
html += '<paper-button raised class="secondary block btnAppUnlock"><iron-icon icon="check"></iron-icon><span>' + unlockText + '</span></paper-button>';
html += '</p>';
}
if (info.enableSupporterUnlock) {
html += '<button class="btn btnSignInSupporter" data-role="none" type="button"><span>' + Globalize.translate('ButtonUnlockWithSupporter') + '</span><i class="fa fa-check"></i></button>';
html += '<p>';
html += '<paper-button raised class="submit block btnSignInSupporter"><iron-icon icon="check"></iron-icon><span>' + Globalize.translate('ButtonUnlockWithSupporter') + '</span></paper-button>';
html += '</p>';
}
html += '<button class="btn btnCancel" data-role="none" type="button"><span>' + Globalize.translate('ButtonCancel') + '</span><i class="fa fa-close"></i></button>';
html += '<p>';
html += '<paper-button raised class="cancelDark block btnCancel"><iron-icon icon="close"></iron-icon><span>' + Globalize.translate('ButtonCancel') + '</span></paper-button>';
html += '</p>';
html += '</div>';