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 video osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-05 00:22:32 -05:00
parent 17c23b1c8c
commit 856b9cd9ec
6 changed files with 15 additions and 15 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": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.443", "version": "1.4.444",
"_release": "1.4.443", "_release": "1.4.444",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.443", "tag": "1.4.444",
"commit": "06bd97079047cdcad2a97f6475fe7022bc1c819f" "commit": "d3110971160e5f410d7c31b74589fee6ca6090a6"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

5
dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.js vendored
View file

@ -42,7 +42,10 @@
if (range.getBubbleText) { if (range.getBubbleText) {
value = range.getBubbleText(value); value = range.getBubbleText(value);
} else {
value = Math.round(value);
} }
bubbleText.innerHTML = value; bubbleText.innerHTML = value;
} }
@ -114,7 +117,7 @@
var clientX = e.clientX; var clientX = e.clientX;
var bubbleValue = (clientX - rect.left) / rect.width; var bubbleValue = (clientX - rect.left) / rect.width;
bubbleValue *= 100; bubbleValue *= 100;
updateBubble(this, Math.round(bubbleValue), sliderBubble, sliderBubbleText); updateBubble(this, bubbleValue, sliderBubble, sliderBubbleText);
if (hasHideClass) { if (hasHideClass) {
sliderBubble.classList.remove('hide'); sliderBubble.classList.remove('hide');

2
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -1235,7 +1235,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
state.PlayState.VolumeLevel = player.getVolume(); state.PlayState.VolumeLevel = player.getVolume();
state.PlayState.IsMuted = player.isMuted(); state.PlayState.IsMuted = player.isMuted();
state.PlayState.IsPaused = player.paused(); state.PlayState.IsPaused = player.paused();
state.PlayState.RepeatMode = self.getRepeatMode(); state.PlayState.RepeatMode = self.getRepeatMode(player);
if (streamInfo) { if (streamInfo) {
state.PlayState.PositionTicks = getCurrentTicks(player); state.PlayState.PositionTicks = getCurrentTicks(player);

11
dashboard-ui/bower_components/emby-webcomponents/playback/remotecontrolautoplay.js vendored
View file

@ -3,7 +3,7 @@
function transferPlayback(oldPlayer, newPlayer) { function transferPlayback(oldPlayer, newPlayer) {
oldPlayer.getPlayerState().then(function (state) { playbackManager.getPlayerState(oldPlayer).then(function (state) {
var item = state.NowPlayingItem; var item = state.NowPlayingItem;
@ -13,7 +13,7 @@
var playState = state.PlayState || {}; var playState = state.PlayState || {};
oldPlayer.stop(); playbackManager.stop(oldPlayer);
var itemId = item.Id; var itemId = item.Id;
var resumePositionTicks = playState.PositionTicks || 0; var resumePositionTicks = playState.PositionTicks || 0;
@ -21,7 +21,7 @@
playbackManager.play({ playbackManager.play({
ids: [itemId], ids: [itemId],
startPositionTicks: resumePositionTicks startPositionTicks: resumePositionTicks
}); }, newPlayer);
}); });
} }
@ -42,10 +42,7 @@
return; return;
} }
// If playback is playing locally and a new player is activated, transfer the media to that player transferPlayback(oldPlayer, newPlayer);
if (oldPlayer.isPlaying()) {
transferPlayback(oldPlayer, newPlayer);
}
}); });
}); });

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

@ -31,7 +31,7 @@
html += '<div class="nowPlayingBarTop">'; html += '<div class="nowPlayingBarTop">';
html += '<div class="nowPlayingBarPositionContainer sliderContainer">'; html += '<div class="nowPlayingBarPositionContainer sliderContainer">';
html += '<input type="range" is="emby-slider" pin step=".1" min="0" max="100" value="0" class="nowPlayingBarPositionSlider"/>'; html += '<input type="range" is="emby-slider" pin step=".01" min="0" max="100" value="0" class="nowPlayingBarPositionSlider"/>';
html += '</div>'; html += '</div>';
html += '<div class="nowPlayingBarInfoContainer">'; html += '<div class="nowPlayingBarInfoContainer">';

2
dashboard-ui/videoosd.html
View file

@ -174,7 +174,7 @@
<div class="osdMediaInfo"></div> <div class="osdMediaInfo"></div>
</div> </div>
<div class="sliderContainer" style="margin: .25em .5em;"> <div class="sliderContainer" style="margin: .25em .5em;">
<input type="range" step=".1" min="0" max="100" value="0" is="emby-slider" class="osdPositionSlider" /> <input type="range" step=".01" min="0" max="100" value="0" is="emby-slider" class="osdPositionSlider" />
</div> </div>
<div class="buttons"> <div class="buttons">