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 shared components

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-06 22:11:39 -04:00
parent da25a9cc2a
commit 866ecf78b4
16 changed files with 65 additions and 49 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.157",
"_release": "1.4.157",
"version": "1.4.158",
"_release": "1.4.158",
"_resolution": {
"type": "version",
"tag": "1.4.157",
"commit": "7ec475515f1b5a785c764864221b53d9b63d8151"
"tag": "1.4.158",
"commit": "ffda5994565e3f458e9da09c168cfce699237a0f"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

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

@ -347,7 +347,7 @@
return true;
}
return true;
return browser.touch;
}
function centerDialog(dlg) {

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

@ -136,7 +136,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
});
}
if (playbackManager.canQueueMediaType(item.MediaType)) {
if (playbackManager.canQueue(item)) {
if (options.queue !== false) {
commands.push({
name: globalize.translate('sharedcomponents#Queue'),

1
dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.css vendored
View file

@ -14,6 +14,7 @@
padding: .5em;
color: #fff;
text-align: left;
font-size: 90%;
}
.cardOverlayMediaInfo {

6
dashboard-ui/bower_components/emby-webcomponents/listview/listview.css vendored
View file

@ -58,17 +58,17 @@ button.listItem {
flex-direction: column;
vertical-align: middle;
justify-content: center;
min-height: 48px;
min-height: 3.44em;
}
.two-line {
min-height: 72px;
min-height: 5.15em;
padding-top: 0;
padding-bottom: 0;
}
.three-line {
min-height: 88px;
min-height: 6.3em;
padding-top: 0;
padding-bottom: 0;
}

11
dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js vendored
View file

@ -28,9 +28,14 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
}
function resetRegistration() {
navigator.serviceWorker.ready.then(function (registration) {
serviceWorkerRegistration = registration;
});
var serviceWorker = navigator.serviceWorker;
if (serviceWorker) {
serviceWorker.ready.then(function (registration) {
serviceWorkerRegistration = registration;
});
}
}
resetRegistration();

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

@ -51,7 +51,7 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
});
}
if (playbackManager.canQueueMediaType(mediaType)) {
if (playbackManager.canQueue(item)) {
menuItems.push({
name: globalize.translate('sharedcomponents#Queue'),
id: 'queue'

24
dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js vendored
View file

@ -170,12 +170,7 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa
// transform is the only way to guarantee animation
options.enableNativeScroll = false;
}
else if (browser.edge && (!browser.xboxOne && !browser.touch)) {
// no scrolling supported
options.enableNativeScroll = false;
}
else if (layoutManager.desktop ||
!browser.animate) {
else if (layoutManager.desktop || !browser.animate) {
options.enableNativeScroll = true;
}
@ -899,19 +894,24 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa
return;
}
var delta = normalizeWheelDelta(event);
// Trap scrolling only when necessary and/or requested
if (delta > 0 && pos.dest < pos.end || delta < 0 && pos.dest > pos.start) {
//stopDefault(event, 1);
}
if (transform) {
// Trap scrolling only when necessary and/or requested
if (delta > 0 && pos.dest < pos.end || delta < 0 && pos.dest > pos.start) {
//stopDefault(event, 1);
}
self.slideBy(o.scrollBy * delta);
} else {
if (isSmoothScrollSupported) {
delta *= 12;
}
if (o.horizontal) {
slideeElement.scrollLeft += 12 * delta;
slideeElement.scrollLeft += delta;
} else {
slideeElement.scrollTop += 12 * delta;
slideeElement.scrollTop += delta;
}
}
}