milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update play menus

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-18 14:53:10 -05:00
parent ad285bf734
commit 3a7bff35d6
11 changed files with 87 additions and 50 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.475",
"_release": "1.4.475",
"version": "1.4.476",
"_release": "1.4.476",
"_resolution": {
"type": "version",
"tag": "1.4.475",
"commit": "ee9afc32bf7c7da8a40158d556cb217bd2c80ef5"
"tag": "1.4.476",
"commit": "802991db23eeaba201548ad9987282a2cab2671a"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

12
dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css vendored
View file

@ -54,8 +54,8 @@
.emby-button > i {
/* For non-fab buttons that have icons */
font-size: 1.36em;
width: auto;
height: auto;
width: 1em;
height: 1em;
}
.fab {
@ -72,8 +72,8 @@
}
.fab > i {
height: auto;
width: auto;
height: 1em;
width: 1em;
vertical-align: middle;
font-size: 2.85em;
}
@ -88,8 +88,8 @@
}
.fab.mini > i {
height: auto;
width: auto;
height: 1em;
width: 1em;
font-size: 1.72em;
}

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

@ -128,7 +128,7 @@
if (playbackManager.canPlay(item)) {
html += '<button is="emby-button" class="itemAction autoSize fab cardOverlayFab mini" data-action="playmenu"><i class="md-icon cardOverlayFab-md-icon">&#xE037;</i></button>';
html += '<button is="emby-button" class="itemAction autoSize fab cardOverlayFab mini" data-action="resume"><i class="md-icon cardOverlayFab-md-icon">&#xE037;</i></button>';
buttonCount++;
}

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

@ -1,8 +1,6 @@
define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'], function (actionsheet, datetime, playbackManager, globalize, appSettings) {
'use strict';
var isMobileApp = window.Dashboard != null;
function show(options) {
var item = options.item;
@ -17,7 +15,7 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
var playableItemId = itemType === 'Program' ? channelId : itemId;
if (!resumePositionTicks && mediaType !== "Audio" && !isFolder) {
if (!resumePositionTicks || isFolder) {
playbackManager.play({
ids: [playableItemId],
serverId: serverId
@ -44,13 +42,6 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
});
}
if (itemType === "Audio" || itemType === "MusicAlbum" || itemType === "MusicArtist" || itemType === "MusicGenre") {
menuItems.push({
name: globalize.translate('sharedcomponents#InstantMix'),
id: 'instantmix'
});
}
if (isFolder || itemType === "MusicArtist" || itemType === "MusicGenre") {
menuItems.push({
name: globalize.translate('sharedcomponents#Shuffle'),
@ -84,9 +75,6 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
items: [item]
});
break;
case 'instantmix':
playbackManager.instantMix(item);
break;
case 'shuffle':
playbackManager.shuffle(item);
break;

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

@ -252,7 +252,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
});
}
else if (action === 'play') {
else if (action === 'play' || action === 'resume') {
var startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
@ -431,7 +431,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
var cmd = e.detail.command;
if (cmd === 'play' || cmd === 'record' || cmd === 'menu' || cmd === 'info') {
if (cmd === 'play' || cmd === 'resume' || cmd === 'record' || cmd === 'menu' || cmd === 'info') {
var card = dom.parentWithClass(e.target, 'itemAction');
if (card) {