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

update shared components

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-09 00:58:57 -04:00
parent d26f22c852
commit ca36b18094
8 changed files with 28 additions and 19 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.290",
"_release": "1.4.290",
"version": "1.4.292",
"_release": "1.4.292",
"_resolution": {
"type": "version",
"tag": "1.4.290",
"commit": "f15ea365d1ca29361d3d3ac1348fc6fdbf7773e3"
"tag": "1.4.292",
"commit": "42bd91dd686bbe14a0126e620d0fececb757516b"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

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

@ -109,7 +109,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (screenWidth >= 2500) {
return 6;
}
if (screenWidth >= 2100) {
if (screenWidth >= 1600) {
return 5;
}
if (screenWidth >= 1200) {

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

@ -29,9 +29,8 @@
});
}
function updateBubble(range, bubble) {
function updateBubble(range, value, bubble) {
var value = range.value;
bubble.style.left = (value - 1) + '%';
if (range.getBubbleText) {
@ -72,16 +71,26 @@
this.addEventListener('input', function (e) {
this.dragging = true;
updateBubble(this, sliderBubble);
});
this.addEventListener('change', function () {
this.dragging = false;
updateValues(this, backgroundLower, backgroundUpper);
});
this.addEventListener('mousemove', function (e) {
var rect = this.getBoundingClientRect();
var clientX = e.clientX;
var bubbleValue = (clientX - rect.left) / rect.width;
bubbleValue *= 100;
updateBubble(this, Math.round(bubbleValue), sliderBubble);
if (hasHideClass) {
sliderBubble.classList.remove('hide');
hasHideClass = false;
}
});
this.addEventListener('change', function () {
this.dragging = false;
updateValues(this, backgroundLower, backgroundUpper);
this.addEventListener('mouseleave', function () {
sliderBubble.classList.add('hide');
hasHideClass = true;
});

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

@ -367,7 +367,7 @@
if (item.SeriesTimerId) {
if (status != 'Cancelled' && status != 'Aborted') {
if (status != 'Cancelled') {
return '<i class="md-icon programIcon seriesTimerIcon">&#xE062;</i>';
}

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

@ -117,7 +117,7 @@ define(['css!./indicators.css', 'material-icons'], function () {
if (item.SeriesTimerId) {
if (status != 'Cancelled' && status != 'Aborted') {
if (status != 'Cancelled') {
return '<i class="md-icon timerIndicator indicatorIcon">&#xE062;</i>';
}

3
dashboard-ui/bower_components/emby-webcomponents/itemhelper.js vendored
View file

@ -60,6 +60,7 @@ define(['apphost'], function (appHost) {
}
function supportsAddingToPlaylist(item) {
if (item.Type == 'Program') {
return false;
}
@ -69,7 +70,7 @@ define(['apphost'], function (appHost) {
if (item.Type == 'SeriesTimer') {
return false;
}
return item.RunTimeTicks || item.IsFolder || item.Type == "Genre" || item.Type == "MusicGenre" || item.Type == "MusicArtist";
return item.MediaType || item.IsFolder || item.Type == "Genre" || item.Type == "MusicGenre" || item.Type == "MusicArtist";
}
function canEdit(user, itemType) {

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

@ -21,7 +21,7 @@ define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', '
if (item.SeriesTimerId) {
if (status != 'Cancelled' && status != 'Aborted') {
if (status != 'Cancelled') {
return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">&#xE062;</i>';
}

7
dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js vendored
View file

@ -1,6 +1,5 @@
define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'embyRouter', 'globalize', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button'], function (shell, dialogHelper, loading, layoutManager, connectionManager, embyRouter, globalize) {
define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'userSettings', 'embyRouter', 'globalize', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button'], function (shell, dialogHelper, loading, layoutManager, connectionManager, userSettings, embyRouter, globalize) {
var lastPlaylistId = '';
var currentServerId;
function parentWithClass(elem, className) {
@ -26,7 +25,7 @@
var apiClient = connectionManager.getApiClient(currentServerId);
if (playlistId) {
lastPlaylistId = playlistId;
userSettings.set('playlisteditor-lastplaylistid', playlistId);
addToPlaylist(apiClient, panel, playlistId);
} else {
createPlaylist(apiClient, panel);
@ -126,7 +125,7 @@
});
select.innerHTML = html;
select.value = lastPlaylistId || '';
select.value = userSettings.get('playlisteditor-lastplaylistid') || '';
triggerChange(select);
loading.hide();