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": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.157", "version": "1.4.158",
"_release": "1.4.157", "_release": "1.4.158",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.157", "tag": "1.4.158",
"commit": "7ec475515f1b5a785c764864221b53d9b63d8151" "commit": "ffda5994565e3f458e9da09c168cfce699237a0f"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_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 true; return browser.touch;
} }
function centerDialog(dlg) { 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) { if (options.queue !== false) {
commands.push({ commands.push({
name: globalize.translate('sharedcomponents#Queue'), name: globalize.translate('sharedcomponents#Queue'),

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

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

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

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

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

@ -28,10 +28,15 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
} }
function resetRegistration() { function resetRegistration() {
navigator.serviceWorker.ready.then(function (registration) {
var serviceWorker = navigator.serviceWorker;
if (serviceWorker) {
serviceWorker.ready.then(function (registration) {
serviceWorkerRegistration = registration; serviceWorkerRegistration = registration;
}); });
} }
}
resetRegistration(); 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({ menuItems.push({
name: globalize.translate('sharedcomponents#Queue'), name: globalize.translate('sharedcomponents#Queue'),
id: 'queue' id: 'queue'

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

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

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-icon", "homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.9", "_release": "1.0.9",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.9", "tag": "v1.0.9",
"commit": "f6fb241901377e30e2c9c6cd47e3e8e8beb6574d" "commit": "f6fb241901377e30e2c9c6cd47e3e8e8beb6574d"
}, },
"_source": "git://github.com/polymerelements/iron-icon.git", "_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon" "_originalSource": "PolymerElements/iron-icon"
} }

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

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"homepage": "https://github.com/PolymerElements/iron-meta", "homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
}, },
"_source": "git://github.com/PolymerElements/iron-meta.git", "_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta" "_originalSource": "polymerelements/iron-meta"
} }

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

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6" "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
}, },
"private": true, "private": true,
"homepage": "https://github.com/Polymer/polymer", "homepage": "https://github.com/polymer/polymer",
"_release": "1.6.1", "_release": "1.6.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.1", "tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.1.0",
"_originalSource": "Polymer/polymer" "_originalSource": "polymer/polymer"
} }

2
dashboard-ui/css/dashboard.css
View file

@ -78,7 +78,7 @@ paper-input + .fieldDescription {
.dashboardDocument .mainDrawer { .dashboardDocument .mainDrawer {
z-index: 998 !important; z-index: 998 !important;
top: 65px !important; top: 58px !important;
left: 0 !important; left: 0 !important;
transform: none !important; transform: none !important;
} }

4
dashboard-ui/css/librarymenu.css
View file

@ -220,6 +220,10 @@
align-items: center; align-items: center;
} }
.dashboardDocument {
font-size: 13px;
}
.dashboardDocument .viewMenuBar { .dashboardDocument .viewMenuBar {
background-color: #333; background-color: #333;
height: auto; height: auto;

3
dashboard-ui/devices/android/android.css
View file

@ -1,7 +1,8 @@
@media all and (min-width: 300px) { @media all and (min-width: 300px) {
.libraryViewNav { .libraryViewNav, .libraryViewNav > .contentScrollSlider {
display: flex; display: flex;
flex-grow: 1;
} }
.libraryViewNav .pageTabButton { .libraryViewNav .pageTabButton {

4
dashboard-ui/scripts/librarybrowser.js
View file

@ -272,7 +272,9 @@
clickBar: 1, clickBar: 1,
//centerOffset: window.innerWidth * .05, //centerOffset: window.innerWidth * .05,
hiddenScroll: true, hiddenScroll: true,
requireAnimation: true
// In safari the transform is causing the headers to occasionally disappear or flicker
requireAnimation: !browserInfo.safari
}); });
tabs.scroller.init(); tabs.scroller.init();
} else { } else {

5
dashboard-ui/scripts/site.js
View file

@ -1344,7 +1344,7 @@ var AppInfo = {};
howler: bowerPath + '/howler.js/howler.min', howler: bowerPath + '/howler.js/howler.min',
sortable: bowerPath + '/Sortable/Sortable.min', sortable: bowerPath + '/Sortable/Sortable.min',
isMobile: bowerPath + '/isMobile/isMobile.min', isMobile: bowerPath + '/isMobile/isMobile.min',
headroom: bowerPath + '/headroom.js/dist/headroom.min', headroom: bowerPath + '/headroom.js/dist/headroom',
masonry: bowerPath + '/masonry/dist/masonry.pkgd.min', masonry: bowerPath + '/masonry/dist/masonry.pkgd.min',
humanedate: 'components/humanedate', humanedate: 'components/humanedate',
libraryBrowser: 'scripts/librarybrowser', libraryBrowser: 'scripts/librarybrowser',
@ -1647,6 +1647,9 @@ var AppInfo = {};
canPlay: function (item) { canPlay: function (item) {
return MediaController.canPlay(item); return MediaController.canPlay(item);
}, },
canQueue: function (item) {
return MediaController.canQueueMediaType(item.MediaType, item.Type);
},
instantMix: function (item) { instantMix: function (item) {
return MediaController.instantMix(item); return MediaController.instantMix(item);
}, },