1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update app footer

This commit is contained in:
Luke Pulverenti 2016-08-31 15:17:11 -04:00
parent a96b9dcefa
commit 5cd71abd36
27 changed files with 432 additions and 127 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.207",
"_release": "1.4.207",
"version": "1.4.208",
"_release": "1.4.208",
"_resolution": {
"type": "version",
"tag": "1.4.207",
"commit": "823ec6a2a31d712f1de9fb82f10e221c857c6650"
"tag": "1.4.208",
"commit": "e7d9ca4dc8083c9dc63d5add4d73f0179369461a"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -44,7 +44,10 @@
var pos = getOffsets([options.positionTo])[0];
pos.top += options.positionTo.offsetHeight / 2;
if (options.positionY != 'top') {
pos.top += options.positionTo.offsetHeight / 2;
}
pos.left += options.positionTo.offsetWidth / 2;
var height = dlg.offsetHeight || 300;
@ -65,6 +68,9 @@
pos.top -= (overflowY + 20);
}
pos.top += (options.offsetTop || 0);
pos.left += (options.offsetLeft || 0);
// Do some boundary checking
pos.top = Math.max(pos.top, 10);
pos.left = Math.max(pos.left, 10);
@ -88,7 +94,9 @@
var dialogOptions = {
removeOnClose: true,
enableHistory: options.enableHistory,
scrollY: false
scrollY: false,
entryAnimation: options.entryAnimation,
exitAnimation: options.exitAnimation
};
var backButton = false;
@ -102,8 +110,8 @@
} else {
dialogOptions.modal = false;
dialogOptions.entryAnimationDuration = 140;
dialogOptions.exitAnimationDuration = 180;
dialogOptions.entryAnimationDuration = options.entryAnimationDuration || 140;
dialogOptions.exitAnimationDuration = options.exitAnimationDuration || 180;
dialogOptions.autoFocus = false;
}
@ -119,6 +127,10 @@
dlg.classList.add('actionSheet');
if (options.dialogClass) {
dlg.classList.add(options.dialogClass);
}
var html = '';
var scrollType = layoutManager.desktop ? 'smoothScrollY' : 'hiddenScrollY';
@ -173,6 +185,10 @@
var menuItemClass = browser.noFlex || browser.firefox ? 'actionSheetMenuItem actionSheetMenuItem-noflex' : 'actionSheetMenuItem';
if (options.menuItemClass) {
menuItemClass += ' ' + options.menuItemClass;
}
for (i = 0, length = options.items.length; i < length; i++) {
option = options.items[i];

View file

@ -618,7 +618,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
tag: item.ImageTags.Thumb
});
} else if (item.SeriesThumbImageTag) {
} else if (item.SeriesThumbImageTag && options.inheritThumb !== false) {
imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
type: "Thumb",
@ -626,9 +626,9 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
tag: item.SeriesThumbImageTag
});
} else if (item.ParentThumbItemId) {
} else if (item.ParentThumbItemId && options.inheritThumb !== false) {
imgUrl = apiClient.getThumbImageUrl(item.ParentThumbItemId, {
imgUrl = apiClient.getScaledImageUrl(item.ParentThumbItemId, {
type: "Thumb",
maxWidth: width,
tag: item.ParentThumbImageTag

View file

@ -28,6 +28,8 @@
overflow: hidden;
font-weight: 500;
text-transform: uppercase;
/* Disable webkit tap highlighting */
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
.emby-button.raised, .emby-button.fab {
@ -142,7 +144,8 @@
overflow: hidden;
font-weight: 500;
border-radius: 50%;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
/* Disable webkit tap highlighting */
-webkit-tap-highlight-color: rgba(0,0,0,0);
justify-content: center;
}

View file

@ -5,7 +5,8 @@
bottom: 0;
top: 0;
background-color: rgba(0, 0, 0, .85);
z-index: 998;
/* Just enough to cover poster overlay buttons */
z-index: 1;
line-height: initial;
font-size: initial;
}

View file

@ -1,6 +1,6 @@
{
"name": "hls.js",
"version": "0.5.44",
"version": "0.5.46",
"license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js",
@ -16,11 +16,11 @@
"test",
"tests"
],
"_release": "0.5.44",
"_release": "0.5.46",
"_resolution": {
"type": "version",
"tag": "v0.5.44",
"commit": "f3800e9a8b01157c73d5847a9102137a8d73dc8e"
"tag": "v0.5.46",
"commit": "27578acdf24ae3a6d6dcccb49765ac2b835f84dd"
},
"_source": "git://github.com/dailymotion/hls.js.git",
"_target": "~0.5.7",

View file

@ -1,6 +1,6 @@
{
"name": "hls.js",
"version": "0.5.44",
"version": "0.5.46",
"license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js",

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{
"name": "hls.js",
"version": "0.5.44",
"version": "0.5.46",
"license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js",

View file

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

View file

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