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 components

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-23 14:10:22 -04:00
parent 3309bc33da
commit ae765e2aa9
10 changed files with 45 additions and 83 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

@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.114",
"_release": "1.4.114",
"version": "1.4.115",
"_release": "1.4.115",
"_resolution": {
"type": "version",
"tag": "1.4.114",
"commit": "cf5d4390c6b08e025aaa3d7086172c483bc440ed"
"tag": "1.4.115",
"commit": "eaab061d672e114a94c94afcd5e5b3cb9b2e5c13"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

8
dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css vendored
View file

@ -50,7 +50,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
}
.mdl-slider::-moz-range-track {
background: #666;
background: #444;
border: none;
}
@ -77,7 +77,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
.mdl-slider::-ms-fill-upper {
padding: 0;
background: linear-gradient(to left, transparent, transparent 16px, #666 16px, #666 0);
background: linear-gradient(to left, transparent, transparent 16px, #444 16px, #444 0);
}
.mdl-slider::-webkit-slider-thumb {
@ -225,7 +225,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
}
.mdl-slider:disabled + .mdl-slider__background-flex > .mdl-slider__background-lower {
background-color: #666;
background-color: #444;
left: -6px;
}
@ -315,7 +315,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
}
.mdl-slider__background-upper {
background: #666;
background: #444;
-webkit-flex: 0;
-ms-flex: 0;
flex: 0;

10
dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html vendored
View file

@ -5,14 +5,10 @@
<div class="timeslotHeaders smoothScrollX" style="scroll-behavior: auto;"></div>
</div>
<div class="smoothScrollY guideVerticalScroller" style="flex-grow: 1;">
<div class="programContainer">
<div class="channelList"></div>
<div class="programGridContainer programGrid smoothScrollX" style="white-space: nowrap;">
</div>
<div class="smoothScrollY guideVerticalScroller programContainer" style="flex-grow: 1;">
<div class="channelList"></div>
<div class="programGridContainer programGrid smoothScrollX" style="white-space: nowrap;">
</div>
</div>

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

@ -10,15 +10,25 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
var mediaType = item.MediaType;
var isFolder = item.IsFolder;
var itemId = item.Id;
var channelId = item.ChannelId;
var serverId = item.ServerId;
var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null;
var showExternalPlayer = isMobileApp && mediaType == 'Video' && !isFolder && appSettings.enableExternalPlayers();
var playableItemId = itemType == 'Program' ? channelId : itemId;
if (!resumePositionTicks && mediaType != "Audio" && !isFolder && !showExternalPlayer) {
playbackManager.play({
items: [item]
});
if (itemType == 'Program') {
playbackManager.play({
ids: [channelId],
serverId: serverId
});
} else {
playbackManager.play({
items: [item]
});
}
return;
}
@ -79,18 +89,18 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
case 'play':
playbackManager.play({
ids: [itemId],
serverId: item.ServerId
ids: [playableItemId],
serverId: serverId
});
break;
case 'externalplayer':
LibraryBrowser.playInExternalPlayer(itemId);
LibraryBrowser.playInExternalPlayer(playableItemId);
break;
case 'resume':
playbackManager.play({
ids: [itemId],
ids: [playableItemId],
startPositionTicks: resumePositionTicks,
serverId: item.ServerId
serverId: serverId
});
break;
case 'queue':

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

@ -168,6 +168,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
var item = {
Type: card.getAttribute('data-type'),
Id: card.getAttribute('data-id'),
ChannelId: card.getAttribute('data-channelid'),
ServerId: card.getAttribute('data-serverid'),
MediaType: card.getAttribute('data-mediatype'),
IsFolder: card.getAttribute('data-isfolder') == 'true',

6
dashboard-ui/bower_components/polymer/.bower.json vendored
View file

@ -31,14 +31,14 @@
"web-component-tester": "*"
},
"private": true,
"homepage": "https://github.com/polymer/polymer",
"homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.0",
"_resolution": {
"type": "version",
"tag": "v1.6.0",
"commit": "8715c83bf04a228de00ec662ed43eb6141e61b91"
},
"_source": "git://github.com/polymer/polymer.git",
"_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0",
"_originalSource": "polymer/polymer"
"_originalSource": "Polymer/polymer"
}