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-03 15:58:22 -05:00
parent f80fcc874a
commit fa620ed136
5 changed files with 19 additions and 35 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.437", "version": "1.4.438",
"_release": "1.4.437", "_release": "1.4.438",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.437", "tag": "1.4.438",
"commit": "511296d852a7375418f99bfbb7a392ba07f436be" "commit": "088b06ac2ac3e7d330b767ebb1cc4be28ff9f434"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

24
dashboard-ui/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js vendored
View file

@ -17,6 +17,7 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
var currentSrc; var currentSrc;
var started = false; var started = false;
var hlsPlayer; var hlsPlayer;
var enableCustomControls;
var winJsPlaybackItem; var winJsPlaybackItem;
var currentPlayOptions; var currentPlayOptions;
@ -564,11 +565,12 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
setCurrentTrackElement(subtitleTrackIndexToSetOnPlaying); setCurrentTrackElement(subtitleTrackIndexToSetOnPlaying);
//var requiresNativeControls = !self.enableCustomVideoControls(); if (enableCustomControls) {
this.removeAttribute('controls');
} else {
this.setAttribute('controls', 'controls');
}
//if (requiresNativeControls) {
// $(element).attr('controls', 'controls');
//}
seekOnPlaybackStart(e.target); seekOnPlaybackStart(e.target);
if (currentPlayOptions.fullscreen) { if (currentPlayOptions.fullscreen) {
@ -716,8 +718,6 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
// return true; // return true;
//} //}
//return self.canAutoPlayVideo();
return true; return true;
} }
@ -1046,11 +1046,7 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
loading.show(); loading.show();
var requiresNativeControls = !enableCustomVideoControls(); enableCustomControls = enableCustomVideoControls();
// Safari often displays the poster under the video and it doesn't look good
var poster = /*!$.browser.safari &&*/ options.poster ? (' poster="' + options.poster + '"') : '';
poster = '';
var dlg = document.createElement('div'); var dlg = document.createElement('div');
@ -1071,12 +1067,12 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
var html = ''; var html = '';
// Can't autoplay in these browsers so we need to use the full controls // Can't autoplay in these browsers so we need to use the full controls
if (requiresNativeControls) { if (!enableCustomControls || !appHost.supports('htmlvideoautoplay')) {
html += '<video class="htmlvideoplayer" preload="metadata" autoplay="autoplay"' + poster + ' controls="controls" webkit-playsinline playsinline>'; html += '<video class="htmlvideoplayer" preload="metadata" autoplay="autoplay" controls="controls" webkit-playsinline playsinline>';
} else { } else {
// Chrome 35 won't play with preload none // Chrome 35 won't play with preload none
html += '<video class="htmlvideoplayer htmlvideoplayer-nocontrols" preload="metadata" autoplay="autoplay"' + poster + ' webkit-playsinline playsinline>'; html += '<video class="htmlvideoplayer htmlvideoplayer-nocontrols" preload="metadata" autoplay="autoplay" webkit-playsinline playsinline>';
} }
html += '</video>'; html += '</video>';

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

@ -407,10 +407,6 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
}); });
break; break;
} }
case 'externalplayer':
LibraryBrowser.playInExternalPlayer(itemId);
getResolveFunction(resolve, id)();
break;
case 'album': case 'album':
{ {
embyRouter.showItem(item.AlbumId, item.ServerId); embyRouter.showItem(item.AlbumId, item.ServerId);

13
dashboard-ui/bower_components/emby-webcomponents/playmenu.js vendored
View file

@ -15,10 +15,9 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
var serverId = item.ServerId; var serverId = item.ServerId;
var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null; var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null;
var showExternalPlayer = isMobileApp && mediaType === 'Video' && !isFolder && appSettings.enableExternalPlayers();
var playableItemId = itemType === 'Program' ? channelId : itemId; var playableItemId = itemType === 'Program' ? channelId : itemId;
if (!resumePositionTicks && mediaType !== "Audio" && !isFolder && !showExternalPlayer) { if (!resumePositionTicks && mediaType !== "Audio" && !isFolder) {
playbackManager.play({ playbackManager.play({
ids: [playableItemId], ids: [playableItemId],
serverId: serverId serverId: serverId
@ -45,13 +44,6 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
}); });
} }
if (showExternalPlayer) {
menuItems.push({
name: globalize.translate('ButtonPlayExternalPlayer'),
id: 'externalplayer'
});
}
if (playbackManager.canQueue(item)) { if (playbackManager.canQueue(item)) {
menuItems.push({ menuItems.push({
name: globalize.translate('sharedcomponents#Queue'), name: globalize.translate('sharedcomponents#Queue'),
@ -87,9 +79,6 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
serverId: serverId serverId: serverId
}); });
break; break;
case 'externalplayer':
LibraryBrowser.playInExternalPlayer(playableItemId);
break;
case 'resume': case 'resume':
playbackManager.play({ playbackManager.play({
ids: [playableItemId], ids: [playableItemId],

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

@ -838,7 +838,10 @@
view.querySelector('.pageContainer').addEventListener('click', function () { view.querySelector('.pageContainer').addEventListener('click', function () {
playbackManager.playPause(currentPlayer); // TODO: Replace this check with click vs tap detection
if (!browser.touch) {
playbackManager.playPause(currentPlayer);
}
showOsd(); showOsd();
}); });