update shared components
This commit is contained in:
parent
d26f22c852
commit
ca36b18094
8 changed files with 28 additions and 19 deletions
|
@ -14,12 +14,12 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {},
|
"devDependencies": {},
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"version": "1.4.290",
|
"version": "1.4.292",
|
||||||
"_release": "1.4.290",
|
"_release": "1.4.292",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.4.290",
|
"tag": "1.4.292",
|
||||||
"commit": "f15ea365d1ca29361d3d3ac1348fc6fdbf7773e3"
|
"commit": "42bd91dd686bbe14a0126e620d0fececb757516b"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||||
"_target": "^1.2.1",
|
"_target": "^1.2.1",
|
||||||
|
|
|
@ -109,7 +109,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
|
||||||
if (screenWidth >= 2500) {
|
if (screenWidth >= 2500) {
|
||||||
return 6;
|
return 6;
|
||||||
}
|
}
|
||||||
if (screenWidth >= 2100) {
|
if (screenWidth >= 1600) {
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
if (screenWidth >= 1200) {
|
if (screenWidth >= 1200) {
|
||||||
|
|
|
@ -29,9 +29,8 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateBubble(range, bubble) {
|
function updateBubble(range, value, bubble) {
|
||||||
|
|
||||||
var value = range.value;
|
|
||||||
bubble.style.left = (value - 1) + '%';
|
bubble.style.left = (value - 1) + '%';
|
||||||
|
|
||||||
if (range.getBubbleText) {
|
if (range.getBubbleText) {
|
||||||
|
@ -72,16 +71,26 @@
|
||||||
|
|
||||||
this.addEventListener('input', function (e) {
|
this.addEventListener('input', function (e) {
|
||||||
this.dragging = true;
|
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) {
|
if (hasHideClass) {
|
||||||
sliderBubble.classList.remove('hide');
|
sliderBubble.classList.remove('hide');
|
||||||
hasHideClass = false;
|
hasHideClass = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.addEventListener('change', function () {
|
this.addEventListener('mouseleave', function () {
|
||||||
this.dragging = false;
|
|
||||||
updateValues(this, backgroundLower, backgroundUpper);
|
|
||||||
sliderBubble.classList.add('hide');
|
sliderBubble.classList.add('hide');
|
||||||
hasHideClass = true;
|
hasHideClass = true;
|
||||||
});
|
});
|
||||||
|
|
|
@ -367,7 +367,7 @@
|
||||||
|
|
||||||
if (item.SeriesTimerId) {
|
if (item.SeriesTimerId) {
|
||||||
|
|
||||||
if (status != 'Cancelled' && status != 'Aborted') {
|
if (status != 'Cancelled') {
|
||||||
return '<i class="md-icon programIcon seriesTimerIcon"></i>';
|
return '<i class="md-icon programIcon seriesTimerIcon"></i>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,7 @@ define(['css!./indicators.css', 'material-icons'], function () {
|
||||||
|
|
||||||
if (item.SeriesTimerId) {
|
if (item.SeriesTimerId) {
|
||||||
|
|
||||||
if (status != 'Cancelled' && status != 'Aborted') {
|
if (status != 'Cancelled') {
|
||||||
return '<i class="md-icon timerIndicator indicatorIcon"></i>';
|
return '<i class="md-icon timerIndicator indicatorIcon"></i>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,7 @@ define(['apphost'], function (appHost) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function supportsAddingToPlaylist(item) {
|
function supportsAddingToPlaylist(item) {
|
||||||
|
|
||||||
if (item.Type == 'Program') {
|
if (item.Type == 'Program') {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -69,7 +70,7 @@ define(['apphost'], function (appHost) {
|
||||||
if (item.Type == 'SeriesTimer') {
|
if (item.Type == 'SeriesTimer') {
|
||||||
return false;
|
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) {
|
function canEdit(user, itemType) {
|
||||||
|
|
|
@ -21,7 +21,7 @@ define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', '
|
||||||
|
|
||||||
if (item.SeriesTimerId) {
|
if (item.SeriesTimerId) {
|
||||||
|
|
||||||
if (status != 'Cancelled' && status != 'Aborted') {
|
if (status != 'Cancelled') {
|
||||||
return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon"></i>';
|
return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon"></i>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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;
|
var currentServerId;
|
||||||
|
|
||||||
function parentWithClass(elem, className) {
|
function parentWithClass(elem, className) {
|
||||||
|
@ -26,7 +25,7 @@
|
||||||
var apiClient = connectionManager.getApiClient(currentServerId);
|
var apiClient = connectionManager.getApiClient(currentServerId);
|
||||||
|
|
||||||
if (playlistId) {
|
if (playlistId) {
|
||||||
lastPlaylistId = playlistId;
|
userSettings.set('playlisteditor-lastplaylistid', playlistId);
|
||||||
addToPlaylist(apiClient, panel, playlistId);
|
addToPlaylist(apiClient, panel, playlistId);
|
||||||
} else {
|
} else {
|
||||||
createPlaylist(apiClient, panel);
|
createPlaylist(apiClient, panel);
|
||||||
|
@ -126,7 +125,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
select.innerHTML = html;
|
select.innerHTML = html;
|
||||||
select.value = lastPlaylistId || '';
|
select.value = userSettings.get('playlisteditor-lastplaylistid') || '';
|
||||||
triggerChange(select);
|
triggerChange(select);
|
||||||
|
|
||||||
loading.hide();
|
loading.hide();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue