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

Merge pull request #1739 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2016-05-16 01:48:30 -04:00
commit 418afa775b
24 changed files with 597 additions and 474 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

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.3.27", "version": "1.3.37",
"_release": "1.3.27", "_release": "1.3.37",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.3.27", "tag": "1.3.37",
"commit": "d50eb817e00a23afb8fd5c5fe5a08745de291951" "commit": "43c74d495f1fbdae6d86ac6608e934d396069806"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

40
dashboard-ui/bower_components/emby-webcomponents/focusmanager.js vendored
View file

@ -305,14 +305,8 @@ define([], function () {
return intersectsInternal(a1, a2, b1, b2) || intersectsInternal(b1, b2, a1, a2); return intersectsInternal(a1, a2, b1, b2) || intersectsInternal(b1, b2, a1, a2);
} }
var enableDebugInfo = false;
function getNearestElements(elementInfos, options, direction) { function getNearestElements(elementInfos, options, direction) {
if (enableDebugInfo) {
removeAll();
}
// Get elements and work out x/y points // Get elements and work out x/y points
var cache = [], var cache = [],
point1x = parseFloat(options.left) || 0, point1x = parseFloat(options.left) || 0,
@ -379,10 +373,6 @@ define([], function () {
break; break;
} }
if (enableDebugInfo) {
addDebugInfo(elem, distX, distY);
}
var distT = Math.sqrt(distX * distX + distY * distY); var distT = Math.sqrt(distX * distX + distY * distY);
var distT2 = Math.sqrt(distX2 * distX2 + distY2 * distY2); var distT2 = Math.sqrt(distX2 * distX2 + distY2 * distY2);
@ -405,36 +395,6 @@ define([], function () {
return cache; return cache;
} }
function addDebugInfo(elem, distX, distY) {
var div = elem.querySelector('focusInfo');
if (!div) {
div = document.createElement('div');
div.classList.add('focusInfo');
elem.appendChild(div);
if (getComputedStyle(elem, null).getPropertyValue('position') == 'static') {
elem.style.position = 'relative';
}
div.style.position = 'absolute';
div.style.left = '0';
div.style.top = '0';
div.style.color = 'white';
div.style.backgroundColor = 'red';
div.style.padding = '2px';
}
div.innerHTML = Math.round(distX) + ',' + Math.round(distY);
}
function removeAll() {
var elems = document.querySelectorAll('.focusInfo');
for (var i = 0, length = elems.length; i < length; i++) {
elems[i].parentNode.removeChild(elems[i]);
}
}
function sortNodesX(a, b) { function sortNodesX(a, b) {
var result = a.distX - b.distX; var result = a.distX - b.distX;

9
dashboard-ui/bower_components/emby-webcomponents/formdialog.css vendored
View file

@ -15,7 +15,7 @@
margin-left: .75em; margin-left: .75em;
} }
.formDialog form { .formDialog .centeredContent {
margin: 0 auto; margin: 0 auto;
} }
@ -25,16 +25,19 @@
.formDialog .dialogContentInner { .formDialog .dialogContentInner {
padding-bottom: 10vh; padding-bottom: 10vh;
padding-top: 1em;
} }
.layout-tv .formDialog .dialogContentInner { .layout-tv .formDialog .dialogContentInner {
padding-bottom: 50vh; padding-bottom: 50vh;
} }
.formDialog .centeredContent {
max-width: 700px;
}
@media all and (min-width: 1000px) { @media all and (min-width: 1000px) {
.formDialog form { .layout-tv .formDialog .centeredContent {
max-width: 70vw; max-width: 70vw;
} }
} }

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

@ -1,4 +1,4 @@
define(['require', 'globalize', 'connectionManager', 'loading', 'scrollHelper', 'datetime', 'focusManager', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'clearButtonStyle', 'css!./guide.css', 'html!./../icons/mediainfo.html', 'html!./../icons/nav.html', 'scrollStyles'], function (require, globalize, connectionManager, loading, scrollHelper, datetime, focusManager, imageLoader, events, layoutManager, itemShortcuts, registrationServices) { define(['require', 'browser', 'globalize', 'connectionManager', 'loading', 'scrollHelper', 'datetime', 'focusManager', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'clearButtonStyle', 'css!./guide.css', 'html!./../icons/mediainfo.html', 'html!./../icons/nav.html', 'scrollStyles'], function (require, browser, globalize, connectionManager, loading, scrollHelper, datetime, focusManager, imageLoader, events, layoutManager, itemShortcuts, registrationServices) {
function Guide(options) { function Guide(options) {
@ -59,7 +59,7 @@
return registrationServices.validateFeature('livetv').then(function () { return registrationServices.validateFeature('livetv').then(function () {
var limit = 400; var limit = browser.mobile ? 100 : 400;
context.querySelector('.guideRequiresUnlock').classList.add('hide'); context.querySelector('.guideRequiresUnlock').classList.add('hide');

65
dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js vendored
View file

@ -2,6 +2,7 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events'], functio
var thresholdX; var thresholdX;
var thresholdY; var thresholdY;
var windowSize;
function resetThresholds() { function resetThresholds() {
@ -15,25 +16,36 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events'], functio
thresholdX = x; thresholdX = x;
thresholdY = y; thresholdY = y;
resetWindowSize();
} }
resetThresholds();
window.addEventListener("orientationchange", resetThresholds); window.addEventListener("orientationchange", resetThresholds);
window.addEventListener('resize', resetThresholds);
events.on(layoutManager, 'modechange', resetThresholds); events.on(layoutManager, 'modechange', resetThresholds);
var wheelEvent = (document.implementation.hasFeature('Event.wheel', '3.0') ? 'wheel' : 'mousewheel'); var wheelEvent = (document.implementation.hasFeature('Event.wheel', '3.0') ? 'wheel' : 'mousewheel');
function isVisible(elem, windowSize) { function resetWindowSize() {
windowSize = {
innerHeight: window.innerHeight,
innerWidth: window.innerWidth
};
}
resetThresholds();
function isVisible(elem) {
return visibleinviewport(elem, true, thresholdX, thresholdY, windowSize); return visibleinviewport(elem, true, thresholdX, thresholdY, windowSize);
} }
var self = {}; var self = {};
function fillImage(elem) { function fillImage(elem, source, enableEffects) {
var source = elem.getAttribute('data-src');
if (!source) {
source = elem.getAttribute('data-src');
}
if (source) { if (source) {
if (self.enableFade) { if (self.enableFade && enableEffects !== false) {
imageFetcher.loadImage(elem, source).then(fadeIn); imageFetcher.loadImage(elem, source).then(fadeIn);
} else { } else {
imageFetcher.loadImage(elem, source); imageFetcher.loadImage(elem, source);
@ -44,10 +56,6 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events'], functio
function fadeIn(elem) { function fadeIn(elem) {
if (elem.classList.contains('noFade')) {
return;
}
var keyframes = [ var keyframes = [
{ opacity: '0', offset: 0 }, { opacity: '0', offset: 0 },
{ opacity: '1', offset: 1 }]; { opacity: '1', offset: 1 }];
@ -93,11 +101,6 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events'], functio
var anyFound = false; var anyFound = false;
var out = false; var out = false;
var windowSize = {
innerHeight: window.innerHeight,
innerWidth: window.innerWidth
};
// TODO: This out construct assumes left to right, top to bottom // TODO: This out construct assumes left to right, top to bottom
for (var i = 0, length = images.length; i < length; i++) { for (var i = 0, length = images.length; i < length; i++) {
@ -106,7 +109,7 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events'], functio
return; return;
} }
var img = images[i]; var img = images[i];
if (!out && isVisible(img, windowSize)) { if (!out && isVisible(img)) {
anyFound = true; anyFound = true;
fillImage(img); fillImage(img);
} else { } else {
@ -116,6 +119,10 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events'], functio
} }
remaining.push(img); remaining.push(img);
} }
if (out) {
return;
}
} }
images = remaining; images = remaining;
@ -157,29 +164,11 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events'], functio
unveil(); unveil();
} }
function fillImages(elems) {
for (var i = 0, length = elems.length; i < length; i++) {
var elem = elems[0];
var source = elem.getAttribute('data-src');
if (source) {
ImageStore.setImageInto(elem, source);
elem.setAttribute("data-src", '');
}
}
}
function lazyChildren(elem) { function lazyChildren(elem) {
unveilElements(elem.getElementsByClassName('lazy')); unveilElements(elem.getElementsByClassName('lazy'));
} }
function lazyImage(elem, url) {
elem.setAttribute('data-src', url);
fillImages([elem]);
}
function getPrimaryImageAspectRatio(items) { function getPrimaryImageAspectRatio(items) {
var values = []; var values = [];
@ -245,14 +234,8 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events'], functio
} }
} }
function lazyImage(elem, url) {
elem.setAttribute('data-src', url);
fillImage(elem);
}
self.fillImages = fillImages; self.fillImages = fillImages;
self.lazyImage = lazyImage; self.lazyImage = fillImage;
self.lazyChildren = lazyChildren; self.lazyChildren = lazyChildren;
self.getPrimaryImageAspectRatio = getPrimaryImageAspectRatio; self.getPrimaryImageAspectRatio = getPrimaryImageAspectRatio;

8
dashboard-ui/bower_components/emby-webcomponents/loading/loading-lite.js vendored
View file

@ -1,12 +1,16 @@
define(['MaterialSpinner', 'css!./loading'], function () { define(['MaterialSpinner', 'css!./loading'], function () {
var loadingElem;
return { return {
show: function () { show: function () {
var elem = document.querySelector('.docspinner'); var elem = loadingElem;
if (!elem) { if (!elem) {
elem = document.createElement("div"); elem = document.createElement("div");
loadingElem = elem;
elem.classList.add('docspinner'); elem.classList.add('docspinner');
elem.classList.add('mdl-spinner'); elem.classList.add('mdl-spinner');
elem.classList.add('mdl-js-spinner'); elem.classList.add('mdl-js-spinner');
@ -19,7 +23,7 @@ define(['MaterialSpinner', 'css!./loading'], function () {
elem.classList.remove('loadingHide'); elem.classList.remove('loadingHide');
}, },
hide: function () { hide: function () {
var elem = document.querySelector('.docspinner'); var elem = loadingElem;
if (elem) { if (elem) {

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

@ -360,9 +360,11 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
function afterFill(elem, item, options) { function afterFill(elem, item, options) {
var endsAtElem = elem.querySelector('.endsAt'); if (options.endsAt !== false) {
if (endsAtElem) { var endsAtElem = elem.querySelector('.endsAt');
dynamicEndTime(endsAtElem, item); if (endsAtElem) {
dynamicEndTime(endsAtElem, item);
}
} }
var lnkChannel = elem.querySelector('.lnkChannel'); var lnkChannel = elem.querySelector('.lnkChannel');

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

@ -1,3 +1,7 @@
.recordingDialog .btnSubmit { .recordingDialog .btnSubmit {
background-color: #cc3333; background-color: #cc3333;
} }
.layout-tv .btnHeaderSave {
display: none;
}

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

@ -388,7 +388,7 @@
if (recordingCreated) { if (recordingCreated) {
require(['toast'], function (toast) { require(['toast'], function (toast) {
toast(globalize.translate('RecordingScheduled')); toast(globalize.translate('sharedcomponents#RecordingScheduled'));
}); });
resolve(); resolve();
} else { } else {

6
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html vendored
View file

@ -5,7 +5,7 @@
</div> </div>
</div> </div>
<div class="dialogContent smoothScrollY"> <div class="dialogContent smoothScrollY">
<form class="dialogContentInner"> <form class="dialogContentInner centeredContent">
<h1 class="itemName"></h1> <h1 class="itemName"></h1>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
@ -52,11 +52,11 @@
<br /> <br />
<emby-collapsible title="${Advanced}"> <emby-collapsible title="${Advanced}">
<div> <div>
<paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${PrePaddingMinutes}"></paper-input> <paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
</div> </div>
<br /> <br />
<div> <div>
<paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${PostPaddingMinutes}"></paper-input> <paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
</div> </div>
</emby-collapsible> </emby-collapsible>
<br /> <br />

175
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js vendored Normal file
View file

@ -0,0 +1,175 @@
define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'scrollStyles', 'paper-checkbox', 'emby-collapsible', 'paper-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'html!./../icons/mediainfo.html', 'html!./../icons/nav.html'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper) {
var currentDialog;
var recordingUpdated = false;
var currentItemId;
var currentServerId;
function renderTimer(context, item) {
var programInfo = item.ProgramInfo || {};
context.querySelector('.itemName').innerHTML = item.Name;
context.querySelector('.itemEpisodeName').innerHTML = programInfo.EpisodeTitle || '';
context.querySelector('.itemGenres').innerHTML = (programInfo.Genres || []).join(' / ');
context.querySelector('.itemOverview').innerHTML = programInfo.Overview || '';
var timerPageImageContainer = context.querySelector('.timerPageImageContainer');
context.querySelector('.itemMiscInfoPrimary').innerHTML = mediaInfo.getPrimaryMediaInfoHtml(programInfo);
context.querySelector('.itemMiscInfoSecondary').innerHTML = mediaInfo.getSecondaryMediaInfoHtml(programInfo);
context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
var timerStausElem = context.querySelector('.timerStatus');
if (item.Status == 'New') {
timerStausElem.classList.add('hide');
} else {
timerStausElem.classList.remove('hide');
timerStausElem.innerHTML = 'Status:&nbsp;&nbsp;&nbsp;' + item.Status;
}
loading.hide();
}
function closeDialog(isSubmitted) {
recordingUpdated = isSubmitted;
dialogHelper.close(currentDialog);
}
function onSubmit(e) {
loading.show();
var form = this;
var apiClient = connectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
item.PostPaddingSeconds = form.querySelector('#txtPostPaddingMinutes').value * 60;
apiClient.updateLiveTvTimer(item).then(function () {
loading.hide();
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingSaved'));
closeDialog(true);
});
});
});
e.preventDefault();
// Disable default form submission
return false;
}
function init(context) {
context.querySelector('.btnCancel').addEventListener('click', function () {
closeDialog(false);
});
context.querySelector('form').addEventListener('submit', onSubmit);
context.querySelector('.btnHeaderSave').addEventListener('click', function (e) {
context.querySelector('.btnSubmit').click();
});
context.querySelector('.btnSubmit').addEventListener('click', function () {
// Do a fake form submit this the button isn't a real submit button
var fakeSubmit = document.createElement('input');
fakeSubmit.setAttribute('type', 'submit');
fakeSubmit.style.display = 'none';
var form = context.querySelector('form');
form.appendChild(fakeSubmit);
fakeSubmit.click();
// Seeing issues in smart tv browsers where the form does not get submitted if the button is removed prior to the submission actually happening
setTimeout(function () {
form.removeChild(fakeSubmit);
}, 500);
});
}
function reload(context, id) {
loading.show();
currentItemId = id;
var apiClient = connectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(id).then(function (result) {
renderTimer(context, result);
loading.hide();
});
}
function showEditor(itemId, serverId) {
return new Promise(function (resolve, reject) {
recordingUpdated = false;
currentServerId = serverId;
loading.show();
require(['text!./recordingeditor.template.html'], function (template) {
var dialogOptions = {
removeOnClose: true,
scrollY: false
};
if (layoutManager.tv) {
dialogOptions.size = 'fullscreen';
} else {
dialogOptions.size = 'small';
}
var dlg = dialogHelper.createDialog(dialogOptions);
dlg.classList.add('formDialog');
dlg.classList.add('recordingDialog');
var html = '';
html += globalize.translateDocument(template, 'sharedcomponents');
dlg.innerHTML = html;
document.body.appendChild(dlg);
currentDialog = dlg;
dlg.addEventListener('close', function () {
if (recordingUpdated) {
resolve();
} else {
reject();
}
});
if (layoutManager.tv) {
scrollHelper.centerFocus.on(dlg.querySelector('.dialogContent'), false);
}
init(dlg);
reload(dlg, itemId);
dialogHelper.open(dlg);
});
});
}
return {
show: showEditor
};
});

43
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html vendored Normal file
View file

@ -0,0 +1,43 @@
<div class="dialogHeader" style="margin:0 0 2em;">
<button is="paper-icon-button-light" class="btnCancel" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>
<div class="dialogHeaderTitle">
${Edit}
</div>
<div style="margin-left:auto; display: flex; align-items: center; justify-content: center;">
<paper-button class="btnHeaderSave accent" tabindex="-1">
<iron-icon icon="check"></iron-icon>
<span>${Save}</span>
</paper-button>
</div>
</div>
<div class="dialogContent smoothScrollY">
<div class="dialogContentInner centeredContent">
<h1 class="itemName"></h1>
<p class="itemEpisodeName"></p>
<p class="itemMiscInfoPrimary" style="display: flex; align-items: center;"></p>
<p class="itemMiscInfoSecondary" style="display: flex; align-items: center;"></p>
<p class="itemGenres"></p>
<p class="itemOverview"></p>
<p style="margin-top: 2em;" class="timerStatus hide">
</p>
<form>
<br />
<div>
<paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
</div>
<br />
<div>
<paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
</div>
<br />
<br />
<paper-button raised class="btnSubmit block"><iron-icon icon="mediainfo:fiber-manual-record"></iron-icon><span>${Save}</span></paper-button>
<br />
<br />
<br />
</form>
</div>
</div>

6
dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json vendored
View file

@ -34,8 +34,8 @@
"Saturday": "Saturday", "Saturday": "Saturday",
"Days": "Days", "Days": "Days",
"RecordSeries": "Record series", "RecordSeries": "Record series",
"PrePaddingMinutes": "Pre-padding minutes:", "LabelPrePaddingMinutes": "Pre-padding minutes:",
"PostPaddingMinutes": "Post-padding minutes:", "LabelPostPaddingMinutes": "Post-padding minutes:",
"RecordOnAllChannels": "Record on all channels", "RecordOnAllChannels": "Record on all channels",
"RecordAnytime": "Record at any time", "RecordAnytime": "Record at any time",
"RecordOnlyNewEpisodes": "Record only new episodes", "RecordOnlyNewEpisodes": "Record only new episodes",
@ -46,6 +46,8 @@
"OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.", "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
"FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.", "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
"Record": "Record", "Record": "Record",
"Save": "Save",
"Edit": "Edit",
"Download": "Download", "Download": "Download",
"Advanced": "Advanced", "Advanced": "Advanced",
"Refresh": "Refresh", "Refresh": "Refresh",

61
dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js vendored
View file

@ -1,9 +1,11 @@
define(['browser'], function (browser) { define(['browser'], function (browser) {
var allPages = document.querySelectorAll('.mainAnimatedPage'); var allPages = document.querySelectorAll('.mainAnimatedPage');
var currentUrls = [];
var pageContainerCount = allPages.length; var pageContainerCount = allPages.length;
var animationDuration = 500; var animationDuration = 500;
var allowAnimation = true; var allowAnimation = true;
var selectedPageIndex = -1;
function enableAnimation() { function enableAnimation() {
@ -33,9 +35,12 @@ define(['browser'], function (browser) {
pageIndex = 0; pageIndex = 0;
} }
var html = '<div class="page-view" data-type="' + (options.type || '') + '" data-url="' + options.url + '">'; var view = document.createElement('div');
html += options.view; view.classList.add('page-view');
html += '</div>'; if (options.type) {
view.setAttribute('data-type', options.type);
}
view.innerHTML = options.view;
var animatable = allPages[pageIndex]; var animatable = allPages[pageIndex];
@ -43,12 +48,11 @@ define(['browser'], function (browser) {
if (currentPage) { if (currentPage) {
triggerDestroy(currentPage); triggerDestroy(currentPage);
animatable.replaceChild(view, currentPage);
} else {
animatable.appendChild(view);
} }
animatable.innerHTML = html;
var view = animatable.querySelector('.page-view');
if (onBeforeChange) { if (onBeforeChange) {
onBeforeChange(view, false, options); onBeforeChange(view, false, options);
} }
@ -58,6 +62,8 @@ define(['browser'], function (browser) {
// animate here // animate here
return animate(animatable, previousAnimatable, options.transition, options.isBack).then(function () { return animate(animatable, previousAnimatable, options.transition, options.isBack).then(function () {
selectedPageIndex = pageIndex;
currentUrls[pageIndex] = options.url;
if (!options.cancel && previousAnimatable) { if (!options.cancel && previousAnimatable) {
afterAnimate(allPages, pageIndex); afterAnimate(allPages, pageIndex);
} }
@ -122,7 +128,7 @@ define(['browser'], function (browser) {
animations.push(oldAnimatedPage.animate([ animations.push(oldAnimatedPage.animate([
{ transform: 'none', offset: 0 }, { transform: 'none', offset: 0 },
{ transform: 'translateX(' + destination + ')', offset: 1 } { transform: 'translate3d(' + destination + ', 0, 0)', offset: 1 }
], timings)); ], timings));
} }
@ -133,7 +139,7 @@ define(['browser'], function (browser) {
animations.push(newAnimatedPage.animate([ animations.push(newAnimatedPage.animate([
{ transform: 'translateX(' + start + ')', offset: 0 }, { transform: 'translate3d(' + start + ', 0, 0)', offset: 0 },
{ transform: 'none', offset: 1 } { transform: 'none', offset: 1 }
], timings)); ], timings));
@ -215,32 +221,20 @@ define(['browser'], function (browser) {
} }
function getSelectedIndex(allPages) { function getSelectedIndex(allPages) {
for (var i = 0, length = allPages.length; i < length; i++) {
if (!allPages[i].classList.contains('hide')) {
return i;
}
}
return -1; return selectedPageIndex;
} }
function tryRestoreView(options) { function tryRestoreView(options) {
var url = options.url; var url = options.url;
var view = document.querySelector(".page-view[data-url='" + url + "']"); var index = currentUrls.indexOf(url);
var page = parentWithClass(view, 'mainAnimatedPage');
if (view) { if (index != -1) {
var page = allPages[index];
var view = page.querySelector(".page-view");
var index = -1; if (view) {
var pages = document.querySelectorAll('.mainAnimatedPage');
for (var i = 0, length = pages.length; i < length; i++) {
if (pages[i] == page) {
index = i;
break;
}
}
if (index != -1) {
if (options.cancel) { if (options.cancel) {
return; return;
@ -251,7 +245,6 @@ define(['browser'], function (browser) {
var animatable = allPages[index]; var animatable = allPages[index];
var selected = getSelectedIndex(allPages); var selected = getSelectedIndex(allPages);
var previousAnimatable = selected == -1 ? null : allPages[selected]; var previousAnimatable = selected == -1 ? null : allPages[selected];
var view = animatable.querySelector('.page-view');
if (onBeforeChange) { if (onBeforeChange) {
onBeforeChange(view, true, options); onBeforeChange(view, true, options);
@ -261,6 +254,7 @@ define(['browser'], function (browser) {
return animate(animatable, previousAnimatable, options.transition, options.isBack).then(function () { return animate(animatable, previousAnimatable, options.transition, options.isBack).then(function () {
selectedPageIndex = index;
if (!options.cancel && previousAnimatable) { if (!options.cancel && previousAnimatable) {
afterAnimate(allPages, index); afterAnimate(allPages, index);
} }
@ -278,14 +272,7 @@ define(['browser'], function (browser) {
function reset() { function reset() {
var views = document.querySelectorAll(".mainAnimatedPage.hide .page-view"); currentUrls = [];
for (var i = 0, length = views.length; i < length; i++) {
var view = views[i];
triggerDestroy(view);
view.parentNode.removeChild(view);
}
} }
function parentWithClass(elem, className) { function parentWithClass(elem, className) {

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

@ -34,6 +34,6 @@
"commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514" "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.0.0",
"_originalSource": "Polymer/polymer" "_originalSource": "Polymer/polymer"
} }

163
dashboard-ui/components/recordingeditor/recordingeditor.js
View file

@ -1,163 +0,0 @@
define(['dialogHelper', 'loading', 'jQuery', 'mediaInfo', 'paper-checkbox', 'paper-input', 'emby-collapsible', 'paper-button', 'paper-icon-button-light'], function (dialogHelper, loading, $, mediaInfo) {
var currentDialog;
var recordingUpdated = false;
var currentItemId;
function renderTimer(context, item) {
var programInfo = item.ProgramInfo || {};
$('.itemName', context).html(item.Name);
$('.itemEpisodeName', context).html(programInfo.EpisodeTitle || '');
LibraryBrowser.renderGenres($('.itemGenres', context), programInfo);
LibraryBrowser.renderOverview(context.querySelectorAll('.itemOverview'), programInfo);
if (programInfo.ImageTags && programInfo.ImageTags.Primary) {
var imgUrl = ApiClient.getScaledImageUrl(programInfo.Id, {
maxWidth: 200,
maxHeight: 200,
tag: programInfo.ImageTags.Primary,
type: "Primary"
});
$('.timerPageImageContainer', context).css("display", "inline-block")
.html('<img src="' + imgUrl + '" style="max-width:200px;max-height:200px;" />');
} else {
$('.timerPageImageContainer', context).hide();
}
$('.itemMiscInfoPrimary', context).html(mediaInfo.getPrimaryMediaInfoHtml(programInfo));
$('.itemMiscInfoSecondary', context).html(mediaInfo.getSecondaryMediaInfoHtml(programInfo));
$('#txtPrePaddingMinutes', context).val(item.PrePaddingSeconds / 60);
$('#txtPostPaddingMinutes', context).val(item.PostPaddingSeconds / 60);
if (item.Status == 'New') {
$('.timerStatus', context).hide();
} else {
$('.timerStatus', context).show().html('Status:&nbsp;&nbsp;&nbsp;' + item.Status);
}
loading.hide();
}
function closeDialog(isSubmitted) {
recordingUpdated = isSubmitted;
dialogHelper.close(currentDialog);
}
function onSubmit(e) {
loading.show();
var form = this;
ApiClient.getLiveTvTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
item.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
ApiClient.updateLiveTvTimer(item).then(function () {
loading.hide();
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingSaved'));
closeDialog(true);
});
});
});
e.preventDefault();
// Disable default form submission
return false;
}
function init(context) {
context.querySelector('.btnCancel').addEventListener('click', function () {
closeDialog(false);
});
context.querySelector('form').addEventListener('submit', onSubmit);
context.querySelector('.btnHeaderSave').addEventListener('click', function (e) {
context.querySelector('.btnSave').click();
});
}
function reload(context, id) {
loading.show();
currentItemId = id;
ApiClient.getLiveTvTimer(id).then(function (result) {
renderTimer(context, result);
loading.hide();
});
}
function showEditor(itemId) {
return new Promise(function (resolve, reject) {
recordingUpdated = false;
loading.show();
var xhr = new XMLHttpRequest();
xhr.open('GET', 'components/recordingeditor/recordingeditor.template.html', true);
xhr.onload = function (e) {
var template = this.response;
var dlg = dialogHelper.createDialog({
removeOnClose: true,
size: 'small',
autoFocus: false
});
dlg.classList.add('ui-body-b');
dlg.classList.add('background-theme-b');
dlg.classList.add('formDialog');
var html = '';
html += Globalize.translateDocument(template);
dlg.innerHTML = html;
document.body.appendChild(dlg);
dialogHelper.open(dlg);
currentDialog = dlg;
dlg.addEventListener('close', function () {
if (recordingUpdated) {
resolve();
} else {
reject();
}
});
init(dlg);
reload(dlg, itemId);
}
xhr.send();
});
}
return {
show: showEditor
};
});

48
dashboard-ui/components/recordingeditor/recordingeditor.template.html
View file

@ -1,48 +0,0 @@
<div class="dialogHeader" style="margin:0 0 2em;">
<button is="paper-icon-button-light" class="btnCancel" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>
<div class="dialogHeaderTitle">
${ButtonEdit}
</div>
<div style="margin-left:auto; display: flex; align-items: center; justify-content: center;">
<paper-button class="btnHeaderSave accent" tabindex="-1">
<iron-icon icon="check"></iron-icon>
<span>${ButtonSave}</span>
</paper-button>
</div>
</div>
<div class="readOnlyContent" style="margin: 0 auto;">
<div>
<div style="display: none; vertical-align: top; margin-right: 1em; padding-top: 1em;" class="timerPageImageContainer">
</div>
<div style="display: inline-block; vertical-align: middle;">
<h1 class="itemName"></h1>
<p class="itemEpisodeName"></p>
<p class="itemMiscInfo itemMiscInfoPrimary"></p>
<p class="itemMiscInfo itemMiscInfoSecondary"></p>
<p class="itemGenres"></p>
</div>
</div>
<p class="itemOverview smoothScrollY"></p>
<p style="margin-top: 2em;" class="timerStatus">
</p>
</div>
<form class="liveTvTimerForm" style="margin: 0 auto;">
<br />
<div>
<paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
</div>
<br />
<div>
<paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
</div>
<br />
<br />
<button type="submit" data-role="none" class="clearButton btnSave">
<paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
</button>
<br />
<br />
<br />
</form>

368
dashboard-ui/components/viewcontainer-lite.js
View file

@ -1,49 +1,65 @@
define(['jQuery'], function ($) { define(['browser'], function (browser) {
var pageContainerCount; var allPages = document.querySelectorAll('.mainAnimatedPage');
var pageContainerCount = allPages.length;
var animationDuration = 500; var animationDuration = 500;
var allowAnimation = true;
var selectedPageIndex = -1;
function enableAnimation() {
if (!allowAnimation) {
return false;
}
if (browser.tv) {
return false;
}
return true;
}
function loadView(options) { function loadView(options) {
if (options.cancel) {
return;
}
cancelActiveAnimations();
var selected = getSelectedIndex(allPages);
var previousAnimatable = selected == -1 ? null : allPages[selected];
var pageIndex = selected + 1;
if (pageIndex >= pageContainerCount) {
pageIndex = 0;
}
var newViewInfo = normalizeNewView(options);
var newView = newViewInfo.elem;
var dependencies = typeof (newView) == 'string' ? null : newView.getAttribute('data-require');
dependencies = dependencies ? dependencies.split(',') : [];
var isPluginpage = options.url.toLowerCase().indexOf('/configurationpage?') != -1;
if (isPluginpage) {
dependencies.push('jqmpopup');
dependencies.push('jqmcollapsible');
dependencies.push('jqmcheckbox');
dependencies.push('legacy/dashboard');
dependencies.push('legacy/selectmenu');
dependencies.push('jqmcontrolgroup');
}
if (isPluginpage || (newView.classList && newView.classList.contains('type-interior'))) {
dependencies.push('jqmlistview');
dependencies.push('scripts/notifications');
}
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
var animatedPages = document.querySelector('.mainAnimatedPages');
if (options.cancel) {
return;
}
var selected = getSelectedIndex(animatedPages);
var pageIndex = selected + 1;
if (pageIndex >= pageContainerCount) {
pageIndex = 0;
}
var newViewInfo = normalizeNewView(options);
var newView = newViewInfo.elem;
var dependencies = typeof (newView) == 'string' ? null : newView.getAttribute('data-require');
dependencies = dependencies ? dependencies.split(',') : [];
var isPluginpage = options.url.toLowerCase().indexOf('/configurationpage?') != -1;
if (isPluginpage) {
dependencies.push('jqmpopup');
dependencies.push('jqmcollapsible');
dependencies.push('jqmcheckbox');
dependencies.push('legacy/dashboard');
dependencies.push('legacy/selectmenu');
dependencies.push('jqmcontrolgroup');
}
if (isPluginpage || (newView.classList && newView.classList.contains('type-interior'))) {
dependencies.push('jqmlistview');
dependencies.push('scripts/notifications');
}
require(dependencies, function () { require(dependencies, function () {
var allPages = animatedPages.querySelectorAll('.mainAnimatedPage');
var animatable = allPages[pageIndex]; var animatable = allPages[pageIndex];
var currentPage = animatable.querySelector('.page-view'); var currentPage = animatable.querySelector('.page-view');
@ -52,37 +68,45 @@ define(['jQuery'], function ($) {
triggerDestroy(currentPage); triggerDestroy(currentPage);
} }
for (var i = 0, length = allPages.length; i < length; i++) { var view;
if (pageIndex == i) {
allPages[i].classList.remove('hide');
} else {
allPages[i].classList.add('hide');
}
}
if (typeof (newView) == 'string') { if (typeof (newView) == 'string') {
animatable.innerHTML = newView; animatable.innerHTML = newView;
view = animatable.querySelector('.page-view');
} else { } else {
animatable.innerHTML = '';
if (newViewInfo.hasScript) { if (newViewInfo.hasScript) {
// TODO: figure this out without jQuery // TODO: figure this out without jQuery
animatable.innerHTML = '';
$(newView).appendTo(animatable); $(newView).appendTo(animatable);
} else { } else {
animatable.appendChild(newView); if (currentPage) {
animatable.replaceChild(newView, currentPage);
} else {
animatable.appendChild(newView);
}
} }
enhanceNewView(dependencies, newView); enhanceNewView(dependencies, newView);
view = newView;
} }
var view = animatable.querySelector('.page-view');
if (onBeforeChange) { if (onBeforeChange) {
onBeforeChange(view, false, options); onBeforeChange(view, false, options);
} }
$.mobile = $.mobile || {}; beforeAnimate(allPages, pageIndex, selected);
$.mobile.activePage = view; // animate here
animate(animatable, previousAnimatable, options.transition, options.isBack).then(function () {
resolve(view); selectedPageIndex = pageIndex;
if (!options.cancel && previousAnimatable) {
afterAnimate(allPages, pageIndex);
}
$.mobile = $.mobile || {};
$.mobile.activePage = view;
resolve(view);
});
}); });
}); });
} }
@ -141,86 +165,210 @@ define(['jQuery'], function ($) {
}; };
} }
function beforeAnimate(allPages, newPageIndex, oldPageIndex) {
for (var i = 0, length = allPages.length; i < length; i++) {
if (newPageIndex == i || oldPageIndex == i) {
//allPages[i].classList.remove('hide');
} else {
allPages[i].classList.add('hide');
}
}
}
function afterAnimate(allPages, newPageIndex) {
for (var i = 0, length = allPages.length; i < length; i++) {
if (newPageIndex == i) {
//allPages[i].classList.remove('hide');
} else {
allPages[i].classList.add('hide');
}
}
}
function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) {
if (enableAnimation() && newAnimatedPage.animate) {
if (transition == 'slide') {
return slide(newAnimatedPage, oldAnimatedPage, transition, isBack);
} else if (transition == 'fade') {
return fade(newAnimatedPage, oldAnimatedPage, transition, isBack);
}
}
return nullAnimation(newAnimatedPage, oldAnimatedPage, transition, isBack);
}
function nullAnimation(newAnimatedPage, oldAnimatedPage, transition, isBack) {
newAnimatedPage.classList.remove('hide');
return Promise.resolve();
}
function slide(newAnimatedPage, oldAnimatedPage, transition, isBack) {
var timings = {
duration: 450,
iterations: 1,
easing: 'ease-out',
fill: 'both'
}
var animations = [];
if (oldAnimatedPage) {
var destination = isBack ? '100%' : '-100%';
animations.push(oldAnimatedPage.animate([
{ transform: 'none', offset: 0 },
{ transform: 'translate3d(' + destination + ', 0, 0)', offset: 1 }
], timings));
}
newAnimatedPage.classList.remove('hide');
var start = isBack ? '-100%' : '100%';
animations.push(newAnimatedPage.animate([
{ transform: 'translate3d(' + start + ', 0, 0)', offset: 0 },
{ transform: 'none', offset: 1 }
], timings));
currentAnimations = animations;
return new Promise(function (resolve, reject) {
animations[animations.length - 1].onfinish = resolve;
});
}
function fade(newAnimatedPage, oldAnimatedPage, transition, isBack) {
var timings = {
duration: animationDuration,
iterations: 1,
easing: 'ease-out',
fill: 'both'
}
var animations = [];
if (oldAnimatedPage) {
animations.push(oldAnimatedPage.animate([
{ opacity: 1, offset: 0 },
{ opacity: 0, offset: 1 }
], timings));
}
newAnimatedPage.classList.remove('hide');
animations.push(newAnimatedPage.animate([
{ opacity: 0, offset: 0 },
{ opacity: 1, offset: 1 }
], timings));
currentAnimations = animations;
return new Promise(function (resolve, reject) {
animations[animations.length - 1].onfinish = resolve;
});
}
var currentAnimations = [];
function cancelActiveAnimations() {
var animations = currentAnimations;
for (var i = 0, length = animations.length; i < length; i++) {
cancelAnimation(animations[i]);
}
}
function cancelAnimation(animation) {
try {
animation.cancel();
} catch (err) {
console.log('Error canceling animation: ' + err);
}
}
var onBeforeChange; var onBeforeChange;
function setOnBeforeChange(fn) { function setOnBeforeChange(fn) {
onBeforeChange = fn; onBeforeChange = fn;
} }
function getSelectedIndex(animatedPages) { function sendResolve(resolve, view) {
var allPages = animatedPages.querySelectorAll('.mainAnimatedPage');
for (var i = 0, length = allPages.length; i < length; i++) {
if (!allPages[i].classList.contains('hide')) {
return i;
}
}
return -1; // Don't report completion until the animation has finished, otherwise rendering may not perform well
setTimeout(function () {
resolve(view);
}, animationDuration);
} }
function replaceAnimatedPages() { function getSelectedIndex(allPages) {
var elem = document.querySelector('neon-animated-pages.mainAnimatedPages');
if (elem) { return selectedPageIndex;
var div = document.createElement('div');
div.classList.add('mainAnimatedPages');
div.classList.add('skinBody');
div.innerHTML = '<div class="mainAnimatedPage hide"></div><div class="mainAnimatedPage hide"></div><div class="mainAnimatedPage hide"></div>';
elem.parentNode.replaceChild(div, elem);
}
pageContainerCount = document.querySelectorAll('.mainAnimatedPage').length;
} }
function tryRestoreView(options) { function tryRestoreView(options) {
return new Promise(function (resolve, reject) {
var url = options.url; var url = options.url;
var view = document.querySelector(".page-view[data-url='" + url + "']"); var view = document.querySelector(".page-view[data-url='" + url + "']");
var page = parentWithClass(view, 'mainAnimatedPage'); var page = parentWithClass(view, 'mainAnimatedPage');
if (view) { if (view) {
var index = -1; var index = -1;
var pages = document.querySelectorAll('.mainAnimatedPage'); var pages = allPages;
for (var i = 0, length = pages.length; i < length; i++) { for (var i = 0, length = pages.length; i < length; i++) {
if (pages[i] == page) { if (pages[i] == page) {
index = i; index = i;
break; break;
}
} }
if (index != -1) { }
var animatedPages = document.querySelector('.mainAnimatedPages'); if (index != -1) {
if (options.cancel) {
return;
}
var allPages = animatedPages.querySelectorAll('.mainAnimatedPage'); if (options.cancel) {
var animatable = allPages[index]; return;
var view = animatable.querySelector('.page-view'); }
if (onBeforeChange) { cancelActiveAnimations();
onBeforeChange(view, true, options);
}
for (var i = 0, length = allPages.length; i < length; i++) { var animatable = allPages[index];
if (index == i) { var selected = getSelectedIndex(allPages);
allPages[i].classList.remove('hide'); var previousAnimatable = selected == -1 ? null : allPages[selected];
} else {
allPages[i].classList.add('hide'); if (onBeforeChange) {
} onBeforeChange(view, true, options);
}
beforeAnimate(allPages, index, selected);
return animate(animatable, previousAnimatable, options.transition, options.isBack).then(function () {
selectedPageIndex = index;
if (!options.cancel && previousAnimatable) {
afterAnimate(allPages, index);
} }
$.mobile = $.mobile || {}; $.mobile = $.mobile || {};
$.mobile.activePage = view; $.mobile.activePage = view;
resolve(view); return view;
return; });
}
} }
}
reject(); return Promise.reject();
});
} }
function triggerDestroy(view) { function triggerDestroy(view) {
@ -252,12 +400,18 @@ define(['jQuery'], function ($) {
return elem; return elem;
} }
replaceAnimatedPages(); function init(isAnimationAllowed) {
if (allowAnimation && enableAnimation() && !browser.animate) {
require(['webAnimations']);
}
}
return { return {
loadView: loadView, loadView: loadView,
tryRestoreView: tryRestoreView, tryRestoreView: tryRestoreView,
reset: reset, reset: reset,
setOnBeforeChange: setOnBeforeChange setOnBeforeChange: setOnBeforeChange,
init: init
}; };
}); });

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

@ -250,7 +250,7 @@
height: 2px; height: 2px;
transition: all .2s cubic-bezier(.4,0,1,1); transition: all .2s cubic-bezier(.4,0,1,1);
right: 0; right: 0;
transform: translateX(-100%); transform: translate3d(-100%, 0, 0);
border-radius: 0; border-radius: 0;
z-index: 1; z-index: 1;
} }

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

@ -473,7 +473,9 @@
}); });
}); });
LibraryBrowser.renderGenres($('.itemGenres', page), item, null, isStatic); $('.itemGenres', page).each(function() {
LibraryBrowser.renderGenres(this, item, null, isStatic);
});
LibraryBrowser.renderStudios($('.itemStudios', page), item, isStatic); LibraryBrowser.renderStudios($('.itemStudios', page), item, isStatic);
renderUserDataIcons(page, item); renderUserDataIcons(page, item);
LibraryBrowser.renderLinks(page.querySelector('.itemExternalLinks'), item); LibraryBrowser.renderLinks(page.querySelector('.itemExternalLinks'), item);

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

@ -243,7 +243,7 @@
function fadeInRight(elem) { function fadeInRight(elem) {
var pct = browserInfo.mobile ? '1%' : '0.5%'; var pct = browserInfo.mobile ? '1.5%' : '0.5%';
var keyframes = [ var keyframes = [
{ opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 }, { opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
@ -793,9 +793,10 @@
editTimer: function (id) { editTimer: function (id) {
require(['components/recordingeditor/recordingeditor'], function (recordingeditor) { require(['recordingEditor'], function (recordingEditor) {
recordingeditor.show(id); var serverId = ApiClient.serverInfo().Id;
recordingEditor.show(id, serverId);
}); });
}, },
@ -3343,7 +3344,7 @@
} }
} }
elem.html(html).trigger('create'); elem.innerHTML = html;
}, },
renderPremiereDate: function (elem, item) { renderPremiereDate: function (elem, item) {
@ -3390,9 +3391,8 @@
tag: item.BackdropImageTags[0] tag: item.BackdropImageTags[0]
}); });
itemBackdropElement.classList.add('noFade');
itemBackdropElement.classList.remove('noBackdrop'); itemBackdropElement.classList.remove('noBackdrop');
ImageLoader.lazyImage(itemBackdropElement, imgUrl); ImageLoader.lazyImage(itemBackdropElement, imgUrl, false);
hasbackdrop = true; hasbackdrop = true;
} }
else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) { else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
@ -3404,9 +3404,8 @@
maxWidth: screenWidth maxWidth: screenWidth
}); });
itemBackdropElement.classList.add('noFade');
itemBackdropElement.classList.remove('noBackdrop'); itemBackdropElement.classList.remove('noBackdrop');
ImageLoader.lazyImage(itemBackdropElement, imgUrl); ImageLoader.lazyImage(itemBackdropElement, imgUrl, false);
hasbackdrop = true; hasbackdrop = true;
} }
else { else {

17
dashboard-ui/scripts/livetvrecordings.js
View file

@ -54,6 +54,14 @@
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
function getSquareShape() {
return enableScrollX() ? 'overflowSquare' : 'square';
}
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
}
function renderRecordings(elem, recordings) { function renderRecordings(elem, recordings) {
if (recordings.length) { if (recordings.length) {
@ -63,9 +71,16 @@
} }
var recordingItems = elem.querySelector('.recordingItems'); var recordingItems = elem.querySelector('.recordingItems');
if (enableScrollX()) {
recordingItems.classList.add('hiddenScrollX');
} else {
recordingItems.classList.remove('hiddenScrollX');
}
recordingItems.innerHTML = LibraryBrowser.getPosterViewHtml({ recordingItems.innerHTML = LibraryBrowser.getPosterViewHtml({
items: recordings, items: recordings,
shape: "auto", shape: (enableScrollX() ? getSquareShape() : 'auto'),
showTitle: true, showTitle: true,
showParentTitle: true, showParentTitle: true,
centerText: true, centerText: true,

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

@ -1822,6 +1822,7 @@ var AppInfo = {};
define("libjass", [bowerPath + "/libjass/libjass", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency); define("libjass", [bowerPath + "/libjass/libjass", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency);
define("recordingCreator", [embyWebComponentsBowerPath + "/recordingcreator/recordingcreator"], returnFirstDependency); define("recordingCreator", [embyWebComponentsBowerPath + "/recordingcreator/recordingcreator"], returnFirstDependency);
define("recordingEditor", [embyWebComponentsBowerPath + "/recordingcreator/recordingeditor"], returnFirstDependency);
define("mediaInfo", [embyWebComponentsBowerPath + "/mediainfo/mediainfo"], returnFirstDependency); define("mediaInfo", [embyWebComponentsBowerPath + "/mediainfo/mediainfo"], returnFirstDependency);
define("backdrop", [embyWebComponentsBowerPath + "/backdrop/backdrop"], returnFirstDependency); define("backdrop", [embyWebComponentsBowerPath + "/backdrop/backdrop"], returnFirstDependency);
define("fetchHelper", [embyWebComponentsBowerPath + "/fetchhelper"], returnFirstDependency); define("fetchHelper", [embyWebComponentsBowerPath + "/fetchhelper"], returnFirstDependency);
@ -3102,7 +3103,7 @@ var AppInfo = {};
loadTheme(); loadTheme();
if (browserInfo.safari && browserInfo.mobile) { if (browserInfo.safari && browserInfo.mobile) {
initFastClick(); //initFastClick();
} }
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {

8
dashboard-ui/thirdparty/paper-button-style.css vendored
View file

@ -36,11 +36,11 @@
} }
paper-button.submit { paper-button.submit {
color: #4285f4; color: #52B54B;
} }
paper-button[raised].submit { paper-button[raised].submit {
background: #4285f4; background: #52B54B;
color: #fff; color: #fff;
} }
@ -54,11 +54,11 @@
} }
paper-button.secondary { paper-button.secondary {
color: #52B54B; color: #4285f4;
} }
paper-button[raised].secondary { paper-button[raised].secondary {
background: #52B54B; background: #4285f4;
color: #fff; color: #fff;
} }