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

update text

This commit is contained in:
Luke Pulverenti 2016-05-12 15:21:43 -04:00
parent 3af73d4fde
commit 98b0114719
47 changed files with 166 additions and 1977 deletions

View file

@ -54,6 +54,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
<g id="refresh"><path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" /></g> <g id="refresh"><path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" /></g>
<g id="person"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z" /></g> <g id="person"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z" /></g>
<g id="play-arrow"><path d="M8 5v14l11-7z" /></g> <g id="play-arrow"><path d="M8 5v14l11-7z" /></g>
<g id="star"><path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z" /></g>
<g id="folder-open"><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z" /></g> <g id="folder-open"><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z" /></g>
<g id="mode-edit"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" /></g> <g id="mode-edit"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" /></g>
<g id="more-vert"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" /></g> <g id="more-vert"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" /></g>

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.2.87", "version": "1.2.89",
"_release": "1.2.87", "_release": "1.2.89",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.2.87", "tag": "1.2.89",
"commit": "21a6cacb0ec2cf301045a5fb35192753efd71025" "commit": "cab85adec93d4bf79a9badb4beabe3374f597c99"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'layoutManager', 'dialogText', 'paper-button', 'css!./actionsheet', 'html!./../icons/nav.html'], function (dialogHelper, layoutManager, dialogText) { define(['dialogHelper', 'layoutManager', 'globalize', 'paper-button', 'css!./actionsheet', 'html!./../icons/nav.html'], function (dialogHelper, layoutManager, globalize) {
function parentWithClass(elem, className) { function parentWithClass(elem, className) {
@ -179,7 +179,7 @@
if (options.showCancel) { if (options.showCancel) {
html += '<div class="buttons">'; html += '<div class="buttons">';
html += '<paper-button class="btnCancel">' + dialogText.get('Cancel') + '</paper-button>'; html += '<paper-button class="btnCancel">' + globalize.translate('sharedcomponents#ButtonCancel') + '</paper-button>';
html += '</div>'; html += '</div>';
} }
html += '</div>'; html += '</div>';

View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../icons/nav.html', 'css!./../prompt/style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, dialogText) { define(['dialogHelper', 'layoutManager', 'globalize', 'html!./../icons/nav.html', 'css!./../prompt/style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, globalize) {
function getIcon(icon, cssClass, canFocus, autoFocus) { function getIcon(icon, cssClass, canFocus, autoFocus) {
@ -70,12 +70,12 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../icons/nav.html
html += '</p>'; html += '</p>';
} }
var buttonText = options.type == 'error' ? 'Ok' : 'GotIt'; var buttonText = options.type == 'error' ? 'sharedcomponents#ButtonOk' : 'sharedcomponents#ButtonGotIt';
if (raisedButtons) { if (raisedButtons) {
html += '<paper-button raised class="btnSubmit"><iron-icon icon="nav:check"></iron-icon><span>' + dialogText.get(buttonText) + '</span></paper-button>'; html += '<paper-button raised class="btnSubmit"><iron-icon icon="nav:check"></iron-icon><span>' + globalize.translate(buttonText) + '</span></paper-button>';
} else { } else {
html += '<div class="buttons" style="text-align:right;">'; html += '<div class="buttons" style="text-align:right;">';
html += '<paper-button class="btnSubmit">' + dialogText.get(buttonText) + '</paper-button>'; html += '<paper-button class="btnSubmit">' + globalize.translate(buttonText) + '</paper-button>';
html += '</div>'; html += '</div>';
} }

View file

@ -1,4 +1,4 @@
define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) { define(['layoutManager', 'globalize'], function (layoutManager, globalize) {
function showTvConfirm(options) { function showTvConfirm(options) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
@ -8,12 +8,12 @@ define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) {
var items = []; var items = [];
items.push({ items.push({
name: dialogText.get('Ok'), name: globalize.translate('sharedcomponents#ButtonOk'),
id: 'ok' id: 'ok'
}); });
items.push({ items.push({
name: dialogText.get('Cancel'), name: globalize.translate('sharedcomponents#ButtonCancel'),
id: 'cancel' id: 'cancel'
}); });
@ -74,9 +74,9 @@ define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) {
html += '<div class="buttons">'; html += '<div class="buttons">';
html += '<paper-button class="btnConfirm" autofocus>' + dialogText.get('Ok') + '</paper-button>'; html += '<paper-button class="btnConfirm" autofocus>' + globalize.translate('sharedcomponents#ButtonOk') + '</paper-button>';
html += '<paper-button class="btnCancel">' + dialogText.get('Cancel') + '</paper-button>'; html += '<paper-button class="btnCancel">' + globalize.translate('sharedcomponents#ButtonCancel') + '</paper-button>';
html += '</div>'; html += '</div>';

View file

@ -258,13 +258,13 @@
html += '<div class="' + guideProgramNameClass + '">'; html += '<div class="' + guideProgramNameClass + '">';
if (program.IsLive) { if (program.IsLive) {
html += '<span class="liveTvProgram">' + globalize.translate('core#AttributeLive') + '&nbsp;</span>'; html += '<span class="liveTvProgram">' + globalize.translate('sharedcomponents#AttributeLive') + '&nbsp;</span>';
} }
else if (program.IsPremiere) { else if (program.IsPremiere) {
html += '<span class="premiereTvProgram">' + globalize.translate('core#AttributePremiere') + '&nbsp;</span>'; html += '<span class="premiereTvProgram">' + globalize.translate('sharedcomponents#AttributePremiere') + '&nbsp;</span>';
} }
else if (program.IsSeries && !program.IsRepeat) { else if (program.IsSeries && !program.IsRepeat) {
html += '<span class="newTvProgram">' + globalize.translate('core#AttributeNew') + '&nbsp;</span>'; html += '<span class="newTvProgram">' + globalize.translate('sharedcomponents#AttributeNew') + '&nbsp;</span>';
} }
html += program.Name; html += program.Name;
@ -441,13 +441,13 @@
function getFutureDateText(date) { function getFutureDateText(date) {
var weekday = []; var weekday = [];
weekday[0] = globalize.translate('core#OptionSundayShort'); weekday[0] = globalize.translate('sharedcomponents#OptionSundayShort');
weekday[1] = globalize.translate('core#OptionMondayShort'); weekday[1] = globalize.translate('sharedcomponents#OptionMondayShort');
weekday[2] = globalize.translate('core#OptionTuesdayShort'); weekday[2] = globalize.translate('sharedcomponents#OptionTuesdayShort');
weekday[3] = globalize.translate('core#OptionWednesdayShort'); weekday[3] = globalize.translate('sharedcomponents#OptionWednesdayShort');
weekday[4] = globalize.translate('core#OptionThursdayShort'); weekday[4] = globalize.translate('sharedcomponents#OptionThursdayShort');
weekday[5] = globalize.translate('core#OptionFridayShort'); weekday[5] = globalize.translate('sharedcomponents#OptionFridayShort');
weekday[6] = globalize.translate('core#OptionSaturdayShort'); weekday[6] = globalize.translate('sharedcomponents#OptionSaturdayShort');
var day = weekday[date.getDay()]; var day = weekday[date.getDay()];
date = datetime.toLocaleDateString(date); date = datetime.toLocaleDateString(date);
@ -530,7 +530,7 @@
actionsheet.show({ actionsheet.show({
items: dateOptions, items: dateOptions,
title: globalize.translate('core#HeaderSelectDate'), title: globalize.translate('sharedcomponents#HeaderSelectDate'),
callback: function (id) { callback: function (id) {
var date = new Date(); var date = new Date();

View file

@ -19,7 +19,7 @@ define([], function () {
} }
if (/*options.isInlineSpecial &&*/ item.Type == "Episode" && item.ParentIndexNumber == 0) { if (/*options.isInlineSpecial &&*/ item.Type == "Episode" && item.ParentIndexNumber == 0) {
name = Globalize.translate('core#ValueSpecialEpisodeName', name); name = Globalize.translate('sharedcomponents#ValueSpecialEpisodeName', name);
} else if ((item.Type == "Episode" || item.Type == 'Program') && item.IndexNumber != null && item.ParentIndexNumber != null) { } else if ((item.Type == "Episode" || item.Type == 'Program') && item.IndexNumber != null && item.ParentIndexNumber != null) {

View file

@ -71,7 +71,7 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
if (count) { if (count) {
miscInfo.push(globalize.translate('core#TrackCount', count)); miscInfo.push(globalize.translate('sharedcomponents#TrackCount', count));
} }
if (item.CumulativeRunTimeTicks) { if (item.CumulativeRunTimeTicks) {
@ -86,7 +86,7 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
if (count) { if (count) {
miscInfo.push(globalize.translate('core#ItemCount', count)); miscInfo.push(globalize.translate('sharedcomponents#ItemCount', count));
} }
} }
@ -127,7 +127,7 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
if (item.ProductionYear && item.Type == "Series") { if (item.ProductionYear && item.Type == "Series") {
if (item.Status == "Continuing") { if (item.Status == "Continuing") {
miscInfo.push(globalize.translate('core#ValueSeriesYearToPresent', item.ProductionYear)); miscInfo.push(globalize.translate('sharedcomponents#ValueSeriesYearToPresent', item.ProductionYear));
} }
else if (item.ProductionYear) { else if (item.ProductionYear) {
@ -158,17 +158,17 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
if (item.IsLive) { if (item.IsLive) {
miscInfo.push({ miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('core#AttributeLive') + '</div>' html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#AttributeLive') + '</div>'
}); });
} }
else if (item.IsPremiere) { else if (item.IsPremiere) {
miscInfo.push({ miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('core#AttributePremiere') + '</div>' html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#AttributePremiere') + '</div>'
}); });
} }
else if (item.IsSeries && !item.IsRepeat) { else if (item.IsSeries && !item.IsRepeat) {
miscInfo.push({ miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('core#AttributeNew') + '</div>' html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#AttributeNew') + '</div>'
}); });
} }
@ -176,14 +176,14 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
try { try {
date = datetime.parseISO8601Date(item.PremiereDate); date = datetime.parseISO8601Date(item.PremiereDate);
text = globalize.translate('core#OriginalAirDateValue', date.toLocaleDateString()); text = globalize.translate('sharedcomponents#OriginalAirDateValue', date.toLocaleDateString());
miscInfo.push(text); miscInfo.push(text);
} }
catch (e) { catch (e) {
console.log("Error parsing date: " + item.PremiereDate); console.log("Error parsing date: " + item.PremiereDate);
} }
} else if (item.ProductionYear) { } else if (item.ProductionYear) {
text = globalize.translate('core#ReleaseYearValue', item.ProductionYear); text = globalize.translate('sharedcomponents#ReleaseYearValue', item.ProductionYear);
miscInfo.push(text); miscInfo.push(text);
} }
} }
@ -275,7 +275,7 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
endDate = new Date(endDate); endDate = new Date(endDate);
var displayTime = datetime.getDisplayTime(endDate); var displayTime = datetime.getDisplayTime(endDate);
return globalize.translate('core#EndsAtValue', displayTime); return globalize.translate('sharedcomponents#EndsAtValue', displayTime);
} }
} }
@ -292,7 +292,7 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
if (includeText === false) { if (includeText === false) {
return displayTime; return displayTime;
} }
return globalize.translate('core#EndsAtValue', displayTime); return globalize.translate('sharedcomponents#EndsAtValue', displayTime);
} }
function getMediaInfoItem(m, cssClass) { function getMediaInfoItem(m, cssClass) {
@ -400,7 +400,7 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html',
} }
if (options.isInlineSpecial && item.Type == "Episode" && item.ParentIndexNumber == 0) { if (options.isInlineSpecial && item.Type == "Episode" && item.ParentIndexNumber == 0) {
name = globalize.translate('core#ValueSpecialEpisodeName', name); name = globalize.translate('sharedcomponents#ValueSpecialEpisodeName', name);
} else if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) { } else if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) {

View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../icons/nav.html', 'css!./style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, dialogText) { define(['dialogHelper', 'layoutManager', 'globalize', 'html!./../icons/nav.html', 'css!./style.css', 'paper-button', 'paper-icon-button-light', 'paper-input'], function (dialogHelper, layoutManager, globalize) {
function getIcon(icon, cssClass, canFocus, autoFocus) { function getIcon(icon, cssClass, canFocus, autoFocus) {
@ -64,11 +64,11 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../icons/nav.html
html += '<br/>'; html += '<br/>';
if (raisedButtons) { if (raisedButtons) {
html += '<paper-button raised class="btnSubmit"><iron-icon icon="nav:check"></iron-icon><span>' + dialogText.get('Ok') + '</span></paper-button>'; html += '<paper-button raised class="btnSubmit"><iron-icon icon="nav:check"></iron-icon><span>' + globalize.translate('sharedcomponents#ButtonOk') + '</span></paper-button>';
} else { } else {
html += '<div class="buttons">'; html += '<div class="buttons">';
html += '<paper-button class="btnSubmit">' + dialogText.get('Ok') + '</paper-button>'; html += '<paper-button class="btnSubmit">' + globalize.translate('sharedcomponents#ButtonOk') + '</paper-button>';
html += '<paper-button class="btnPromptExit">' + dialogText.get('Cancel') + '</paper-button>'; html += '<paper-button class="btnPromptExit">' + globalize.translate('sharedcomponents#ButtonCancel') + '</paper-button>';
html += '</div>'; html += '</div>';
} }
html += '</form>'; html += '</form>';

View file

@ -71,8 +71,8 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
require(['alert'], function (alert) { require(['alert'], function (alert) {
alert({ alert({
text: Globalize.translate('core#ServerUpdateNeeded', 'https://emby.media'), text: Globalize.translate('sharedcomponents#ServerUpdateNeeded', 'https://emby.media'),
html: Globalize.translate('core#ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>') html: Globalize.translate('sharedcomponents#ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>')
}).then(function () { }).then(function () {
embyRouter.showSelectServer(); embyRouter.showSelectServer();

View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'layoutManager', 'dialogText', './social-share-kit-1.0.4/dist/js/social-share-kit.min', 'css!./social-share-kit-1.0.4/dist/css/social-share-kit.css'], function (dialogHelper, layoutManager, dialogText) { define(['dialogHelper', 'layoutManager', 'globalize', './social-share-kit-1.0.4/dist/js/social-share-kit.min', 'css!./social-share-kit-1.0.4/dist/css/social-share-kit.css'], function (dialogHelper, layoutManager, globalize) {
function showMenu(options) { function showMenu(options) {
@ -22,7 +22,7 @@
html += '</div>'; html += '</div>';
html += '<div class="buttons">'; html += '<div class="buttons">';
html += '<paper-button class="btnCancel">' + dialogText.get('Cancel') + '</paper-button>'; html += '<paper-button class="btnCancel">' + globalize.translate('sharedcomponents#ButtonCancel') + '</paper-button>';
html += '</div>'; html += '</div>';
dlg.innerHTML = html; dlg.innerHTML = html;

View file

@ -0,0 +1,26 @@
{
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"ServerUpdateNeeded": "This Emby Server needs to be updated. To download the latest version, please visit {0}",
"MessageLiveTvGuideRequiresUnlock": "The Live TV Guide is currently limited to {0} channels. Click the unlock button to learn how to enjoy the full experience.",
"AttributeNew": "New",
"AttributePremiere": "Premiere",
"AttributeLive": "Live",
"TrackCount": "{0} tracks",
"ItemCount": "{0} items",
"ValueSeriesYearToPresent": "{0}-Present",
"ReleaseYearValue": "Release year: {0}",
"OriginalAirDateValue": "Original air date: {0}",
"EndsAtValue": "Ends at {0}",
"OptionSundayShort": "Sun",
"OptionMondayShort": "Mon",
"OptionTuesdayShort": "Tue",
"OptionWednesdayShort": "Wed",
"OptionThursdayShort": "Thu",
"OptionFridayShort": "Fri",
"OptionSaturdayShort": "Sat",
"HeaderSelectDate": "Select Date",
"ButtonOk": "Ok",
"ButtonCancel": "Cancel",
"ButtonGotIt": "Got It"
}

View file

@ -36,7 +36,7 @@
"tag": "v1.5.1", "tag": "v1.5.1",
"commit": "e3e34408fad8f7cde59c4255cf3fe90f7dcf91d8" "commit": "e3e34408fad8f7cde59c4255cf3fe90f7dcf91d8"
}, },
"_source": "git://github.com/polymerelements/iron-selector.git", "_source": "git://github.com/PolymerElements/iron-selector.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-selector" "_originalSource": "PolymerElements/iron-selector"
} }

View file

@ -45,7 +45,7 @@
"tag": "v1.0.11", "tag": "v1.0.11",
"commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
}, },
"_source": "git://github.com/PolymerElements/paper-behaviors.git", "_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors" "_originalSource": "polymerelements/paper-behaviors"
} }

View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/paper-ripple", "homepage": "https://github.com/polymerelements/paper-ripple",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
}, },
"_source": "git://github.com/PolymerElements/paper-ripple.git", "_source": "git://github.com/polymerelements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-ripple" "_originalSource": "polymerelements/paper-ripple"
} }

View file

@ -161,8 +161,6 @@
Promise.all(promises).then(function () { Promise.all(promises).then(function () {
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
libraryBrowser.setLastRefreshed(page);
}); });
} }

View file

@ -246,10 +246,6 @@
$('.itemMiscInfoPrimary', context).html(mediaInfo.getPrimaryMediaInfoHtml(program)); $('.itemMiscInfoPrimary', context).html(mediaInfo.getPrimaryMediaInfoHtml(program));
$('.itemMiscInfoSecondary', context).html(mediaInfo.getSecondaryMediaInfoHtml(program)); $('.itemMiscInfoSecondary', context).html(mediaInfo.getSecondaryMediaInfoHtml(program));
$('.itemMiscInfo a').each(function () {
$(this).replaceWith(this.innerHTML);
});
$('#chkNewOnly', context).checked(defaultTimer.RecordNewOnly); $('#chkNewOnly', context).checked(defaultTimer.RecordNewOnly);
$('#chkAllChannels', context).checked(defaultTimer.RecordAnyChannel); $('#chkAllChannels', context).checked(defaultTimer.RecordAnyChannel);
$('#chkAnyTime', context).checked(defaultTimer.RecordAnyTime); $('#chkAnyTime', context).checked(defaultTimer.RecordAnyTime);

View file

@ -7,7 +7,7 @@
<form class="liveTvNewRecordingForm" style="margin: 0 auto;"> <form class="liveTvNewRecordingForm" style="margin: 0 auto;">
<h1 class="itemName" style="margin:0;"></h1> <h1 class="itemName"></h1>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p class="itemMiscInfo itemMiscInfoPrimary"></p> <p class="itemMiscInfo itemMiscInfoPrimary"></p>
<p class="itemMiscInfo itemMiscInfoSecondary"></p> <p class="itemMiscInfo itemMiscInfoSecondary"></p>

View file

@ -16,7 +16,7 @@
<div style="display: none; vertical-align: top; margin-right: 1em; padding-top: 1em;" class="timerPageImageContainer"> <div style="display: none; vertical-align: top; margin-right: 1em; padding-top: 1em;" class="timerPageImageContainer">
</div> </div>
<div style="display: inline-block; vertical-align: middle;"> <div style="display: inline-block; vertical-align: middle;">
<h1 class="itemName" style="margin:0;"></h1> <h1 class="itemName"></h1>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p class="itemMiscInfo itemMiscInfoPrimary"></p> <p class="itemMiscInfo itemMiscInfoPrimary"></p>
<p class="itemMiscInfo itemMiscInfoSecondary"></p> <p class="itemMiscInfo itemMiscInfoSecondary"></p>

View file

@ -258,13 +258,6 @@ iron-list .card {
padding-top: 7px; padding-top: 7px;
} }
@media all and (max-width: 600px) {
.packageReviewText {
display: none;
}
}
.cardImage { .cardImage {
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;

View file

@ -541,7 +541,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
.itemName { .itemName {
font-weight: normal !important; font-weight: normal !important;
margin: 0; margin: .5em 0;
} }
.empty { .empty {
@ -818,6 +818,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
} }
.mediaInfoItem { .mediaInfoItem {
white-space: nowrap; white-space: nowrap;
} }

View file

@ -17,7 +17,7 @@
<div class="primaryDetailsContainer"> <div class="primaryDetailsContainer">
<div class="detailNameContainer"> <div class="detailNameContainer">
<div class="parentName"></div> <div class="parentName"></div>
<h1 class="itemName" style="margin:0;"></h1> <h1 class="itemName"></h1>
<div class="desktopDetails itemMiscInfo" style="margin-top:.5em;"> <div class="desktopDetails itemMiscInfo" style="margin-top:.5em;">
</div> </div>

View file

@ -3,7 +3,7 @@
<div data-role="content"> <div data-role="content">
<div class="readOnlyContent" style="margin:auto; max-width: 720px;"> <div class="readOnlyContent" style="margin:auto; max-width: 720px;">
<h1 class="itemName" style="margin:0;"></h1> <h1 class="itemName"></h1>
<p class="channel" style="margin-top: 2em;"></p> <p class="channel" style="margin-top: 2em;"></p>
<p class="time"></p> <p class="time"></p>

View file

@ -75,7 +75,10 @@
html += "<div>"; html += "<div>";
html += "<span class='storeItemReviewText'>"; html += "<span class='storeItemReviewText'>";
html += new Date(review.timestamp).toDateString(); html += new Date(review.timestamp).toDateString();
html += " " + RatingHelpers.getStoreRatingHtml(review.rating, review.id, review.name, true); if (review.rating) {
html += '<iron-icon icon="star" style="color:#666;height:20px;width:20px;min-height:20px;min-width:20px;margin-right:.25em;"></iron-icon>';
html += review.rating.toFixed(1);
}
html += " " + review.title; html += " " + review.title;
html += "</span>"; html += "</span>";
if (review.review) { if (review.review) {
@ -133,8 +136,12 @@
RegistrationServices.renderPluginInfo(page, pkg, pluginSecurityInfo); RegistrationServices.renderPluginInfo(page, pkg, pluginSecurityInfo);
//Ratings and Reviews //Ratings and Reviews
var ratingHtml = RatingHelpers.getStoreRatingHtml(pkg.avgRating, pkg.id, pkg.name); var ratingHtml = '';
ratingHtml += "<span class='storeReviewCount'>"; if (pkg.avgRating) {
ratingHtml += '<iron-icon icon="star" style="color:#666;height:20px;width:20px;min-height:20px;min-width:20px;margin-right:.25em;"></iron-icon>';
ratingHtml += pkg.avgRating.toFixed(1);
}
ratingHtml += "<span>";
ratingHtml += " " + Globalize.translate('ValueReviewCount').replace('{0}', pkg.totalRatings); ratingHtml += " " + Globalize.translate('ValueReviewCount').replace('{0}', pkg.totalRatings);
ratingHtml += "</span>"; ratingHtml += "</span>";

View file

@ -212,28 +212,24 @@
function loadHomeTab(page, tabContent) { function loadHomeTab(page, tabContent) {
if (libraryBrowser.needsRefresh(tabContent)) { if (window.ApiClient) {
if (window.ApiClient) { var userId = Dashboard.getCurrentUserId();
var userId = Dashboard.getCurrentUserId(); Dashboard.showLoadingMsg();
Dashboard.showLoadingMsg();
getDisplayPreferences('home', userId).then(function (result) { getDisplayPreferences('home', userId).then(function (result) {
Dashboard.getCurrentUser().then(function (user) { Dashboard.getCurrentUser().then(function (user) {
loadSections(tabContent, user, result).then(function () { loadSections(tabContent, user, result).then(function () {
if (!AppInfo.isNativeApp) {
showWelcomeIfNeeded(page, result);
}
Dashboard.hideLoadingMsg();
libraryBrowser.setLastRefreshed(tabContent);
});
if (!AppInfo.isNativeApp) {
showWelcomeIfNeeded(page, result);
}
Dashboard.hideLoadingMsg();
}); });
}); });
} });
} }
} }

View file

@ -1319,7 +1319,7 @@
IncludeItemTypes: "MusicVideo", IncludeItemTypes: "MusicVideo",
Recursive: true, Recursive: true,
Fields: "DateCreated,SyncInfo,CanDelete", Fields: "DateCreated,SyncInfo,CanDelete",
AlbumNames: item.Name Albums: item.Name
}).then(function (result) { }).then(function (result) {
if (result.Items.length) { if (result.Items.length) {

View file

@ -217,7 +217,6 @@
bubbles: true bubbles: true
})); }));
libraryBrowser.setLastRefreshed(view);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }

View file

@ -146,44 +146,6 @@
}); });
}, },
needsRefresh: function (elem) {
var last = parseInt(elem.getAttribute('data-lastrefresh') || '0');
if (!last) {
return true;
}
//if (NavHelper.isBack()) {
// console.log('Not refreshing data because IsBack=true');
// return false;
//}
var now = new Date().getTime();
var cacheDuration;
if (AppInfo.isNativeApp) {
cacheDuration = 300000;
} else if (browserInfo.ipad || browserInfo.iphone || browserInfo.android) {
cacheDuration = 10000;
} else {
cacheDuration = 30000;
}
if ((now - last) < cacheDuration) {
console.log('Not refreshing data due to age');
return false;
}
return true;
},
setLastRefreshed: function (elem) {
elem.setAttribute('data-lastrefresh', new Date().getTime());
elem.classList.add('hasrefreshtime');
},
allowSwipe: function (target) { allowSwipe: function (target) {
function allowSwipeOn(elem) { function allowSwipeOn(elem) {

View file

@ -794,6 +794,10 @@
var btnCast = context.querySelector('.btnCast'); var btnCast = context.querySelector('.btnCast');
if (!btnCast) {
return;
}
var info = MediaController.getPlayerInfo(); var info = MediaController.getPlayerInfo();
if (info.isLocalPlayer) { if (info.isLocalPlayer) {

View file

@ -111,16 +111,12 @@
renderChannels(page, result); renderChannels(page, result);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
LibraryBrowser.setLastRefreshed(page);
}); });
} }
window.LiveTvPage.renderChannelsTab = function (page, tabContent) { window.LiveTvPage.renderChannelsTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { reloadItems(tabContent);
reloadItems(tabContent);
}
}; };
}); });

View file

@ -108,16 +108,12 @@
require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () { require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
renderTimers(page, result.Items); renderTimers(page, result.Items);
}); });
LibraryBrowser.setLastRefreshed(page);
}); });
} }
window.LiveTvPage.renderSeriesTimersTab = function (page, tabContent) { window.LiveTvPage.renderSeriesTimersTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { reload(tabContent);
reload(tabContent);
}
}; };
}); });

View file

@ -37,7 +37,6 @@
}).then(function (result) { }).then(function (result) {
renderItems(page, result.Items, 'activeProgramItems', 'play'); renderItems(page, result.Items, 'activeProgramItems', 'play');
libraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
@ -137,9 +136,7 @@
function renderSuggestedTab(page, tabContent) { function renderSuggestedTab(page, tabContent) {
if (libraryBrowser.needsRefresh(tabContent)) { reload(tabContent);
reload(tabContent);
}
} }
function loadTab(page, index) { function loadTab(page, index) {

View file

@ -245,8 +245,6 @@
LibraryBrowser.saveQueryValues(getSavedQueryKey(context), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(context), query);
LibraryBrowser.setLastRefreshed(context);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }

View file

@ -127,7 +127,6 @@
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
@ -184,9 +183,7 @@
window.MusicPage.renderAlbumArtistsTab = function (page, tabContent) { window.MusicPage.renderAlbumArtistsTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { reloadItems(tabContent);
reloadItems(tabContent);
}
}; };
}); });

View file

@ -180,7 +180,6 @@
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
@ -245,9 +244,7 @@
window.MusicPage.renderAlbumsTab = function (page, tabContent) { window.MusicPage.renderAlbumsTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { reloadItems(tabContent);
reloadItems(tabContent);
}
}; };
}); });

View file

@ -127,7 +127,6 @@
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
@ -184,9 +183,7 @@
window.MusicPage.renderArtistsTab = function (page, tabContent) { window.MusicPage.renderArtistsTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { reloadItems(tabContent);
reloadItems(tabContent);
}
}; };
}); });

View file

@ -91,7 +91,6 @@
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
@ -102,9 +101,7 @@
window.MusicPage.renderFoldersTab = function (page, tabContent) { window.MusicPage.renderFoldersTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { reloadItems(tabContent);
reloadItems(tabContent);
}
}; };
}); });

View file

@ -125,9 +125,7 @@
window.MusicPage.renderGenresTab = function (page, tabContent) { window.MusicPage.renderGenresTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { reloadItems(tabContent);
reloadItems(tabContent);
}
}; };
}); });

View file

@ -49,8 +49,6 @@
ImageLoader.lazyChildren(elem); ImageLoader.lazyChildren(elem);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
libraryBrowser.setLastRefreshed(page);
}); });
} }
@ -203,19 +201,17 @@
var parentId = LibraryMenu.getTopParentId(); var parentId = LibraryMenu.getTopParentId();
if (libraryBrowser.needsRefresh(tabContent)) { console.log('loadSuggestionsTab');
console.log('loadSuggestionsTab'); loadLatest(tabContent, parentId);
loadLatest(tabContent, parentId); loadPlaylists(tabContent, parentId);
loadPlaylists(tabContent, parentId); loadRecentlyPlayed(tabContent, parentId);
loadRecentlyPlayed(tabContent, parentId); loadFrequentlyPlayed(tabContent, parentId);
loadFrequentlyPlayed(tabContent, parentId);
require(['components/favoriteitems'], function (favoriteItems) { require(['components/favoriteitems'], function (favoriteItems) {
favoriteItems.render(tabContent, Dashboard.getCurrentUserId(), parentId, ['favoriteArtists', 'favoriteAlbums', 'favoriteSongs']); favoriteItems.render(tabContent, Dashboard.getCurrentUserId(), parentId, ['favoriteArtists', 'favoriteAlbums', 'favoriteSongs']);
}); });
}
} }
function loadTab(page, index) { function loadTab(page, index) {

View file

@ -35,9 +35,7 @@
}); });
} }
function populateList(options) { function populateList(options) {
requirejs(['scripts/ratingdialog'], function () { populateListInternal(options);
populateListInternal(options);
});
} }
function populateListInternal(options) { function populateListInternal(options) {
@ -207,13 +205,18 @@
html += "</div>"; html += "</div>";
if (!plugin.isExternal) { if (!plugin.isExternal) {
html += "<div class='cardText packageReviewText'>"; html += "<div class='cardText' style='display:flex;align-items:center;'>";
html += plugin.price > 0 ? "$" + plugin.price.toFixed(2) : Globalize.translate('LabelFree');
html += RatingHelpers.getStoreRatingHtml(plugin.avgRating, plugin.id, plugin.name, true);
html += "<span class='storeReviewCount'>"; if (plugin.avgRating) {
html += " " + Globalize.translate('LabelNumberReviews').replace("{0}", plugin.totalRatings); html += '<iron-icon icon="star" style="color:#666;height:20px;width:20px;min-height:20px;min-width:20px;margin-right:.25em;"></iron-icon>';
html += "</span>"; html += plugin.avgRating.toFixed(1);
}
if (plugin.totalRatings) {
html += "<div style='margin-left:.5em;'>";
html += " " + Globalize.translate('LabelNumberReviews').replace("{0}", plugin.totalRatings);
}
html += "</div>";
html += "</div>"; html += "</div>";
} }

View file

@ -109,30 +109,6 @@
}); });
} }
}); });
},
getStoreRatingHtml: function (rating, id, name, noLinks) {
var html = "<div style='margin-left: 5px; margin-right: 5px; display: inline-block; vertical-align:middle;'>";
if (!rating) rating = 0;
for (var i = 1; i <= 5; i++) {
var title = noLinks ? rating + " stars" : "Rate " + i + (i > 1 ? " stars" : " star");
html += noLinks ? "" : "<a href='#' data-id=" + id + " data-name='" + name + "' data-rating=" + i + " onclick='RatingHelpers.ratePackage(this);return false;' >";
if (rating <= i - 1) {
html += "<div class='storeStarRating emptyStarRating' title='" + title + "'></div>";
} else if (rating < i) {
html += "<div class='storeStarRating halfStarRating' title='" + title + "'></div>";
} else {
html += "<div class='storeStarRating' title='" + title + "'></div>";
}
html += noLinks ? "" : "</a>";
}
html += "</div>";
return html;
} }
}; };

View file

@ -161,8 +161,6 @@
query.StartIndex -= query.Limit; query.StartIndex -= query.Limit;
reloadItems(parentItem); reloadItems(parentItem);
}); });
libraryBrowser.setLastRefreshed(view);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
@ -174,13 +172,11 @@
ApiClient.getItem(Dashboard.getCurrentUserId(), params.parentId).then(function (parent) { ApiClient.getItem(Dashboard.getCurrentUserId(), params.parentId).then(function (parent) {
LibraryMenu.setTitle(parent.Name); LibraryMenu.setTitle(parent.Name);
if (libraryBrowser.needsRefresh(view)) { reloadItems(parent);
reloadItems(parent);
}
}); });
} }
else if (libraryBrowser.needsRefresh(view)) { else {
reloadItems(); reloadItems();
} }
}); });

View file

@ -1797,7 +1797,7 @@ var AppInfo = {};
if (navigator.webkitPersistentStorage) { if (navigator.webkitPersistentStorage) {
paths.imageFetcher = embyWebComponentsBowerPath + "/images/persistentimagefetcher"; paths.imageFetcher = embyWebComponentsBowerPath + "/images/persistentimagefetcher";
//paths.imageFetcher = embyWebComponentsBowerPath + "/images/basicimagefetcher"; paths.imageFetcher = embyWebComponentsBowerPath + "/images/basicimagefetcher";
} else if (Dashboard.isRunningInCordova()) { } else if (Dashboard.isRunningInCordova()) {
paths.imageFetcher = 'cordova/imagestore'; paths.imageFetcher = 'cordova/imagestore';
} else { } else {
@ -1926,8 +1926,6 @@ var AppInfo = {};
define("jstree", [bowerPath + "/jstree/dist/jstree", "css!thirdparty/jstree/themes/default/style.min.css"]); define("jstree", [bowerPath + "/jstree/dist/jstree", "css!thirdparty/jstree/themes/default/style.min.css"]);
define('jqm', ['thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js']);
define("jqmbase", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css']); define("jqmbase", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css']);
define("jqmicons", ['jqmbase', 'css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']); define("jqmicons", ['jqmbase', 'css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']);
define("jqmtable", ['jqmbase', "thirdparty/jquerymobile-1.4.5/jqm.table", 'css!thirdparty/jquerymobile-1.4.5/jqm.table.css']); define("jqmtable", ['jqmbase', "thirdparty/jquerymobile-1.4.5/jqm.table", 'css!thirdparty/jquerymobile-1.4.5/jqm.table.css']);
@ -2266,12 +2264,31 @@ var AppInfo = {};
window.Globalize = globalize; window.Globalize = globalize;
loadCoreDictionary(globalize).then(onGlobalizeInit); Promise.all([loadCoreDictionary(globalize), loadSharedComponentsDictionary(globalize)]).then(onGlobalizeInit);
}); });
}); });
}); });
} }
function loadSharedComponentsDictionary(globalize) {
var baseUrl = 'bower_components/emby-webcomponents/strings/';
var languages = ['en-US'];
var translations = languages.map(function (i) {
return {
lang: i,
path: baseUrl + i + '.json'
};
});
globalize.loadStrings({
name: 'sharedcomponents',
translations: translations
});
}
function loadCoreDictionary(globalize) { function loadCoreDictionary(globalize) {
var baseUrl = 'strings/'; var baseUrl = 'strings/';

View file

@ -160,9 +160,7 @@
window.MusicPage.renderSongsTab = function (page, tabContent) { window.MusicPage.renderSongsTab = function (page, tabContent) {
if (LibraryBrowser.needsRefresh(tabContent)) { reloadItems(tabContent);
reloadItems(tabContent);
}
}; };
}); });

View file

@ -28,7 +28,7 @@
<div class="primaryDetailsContainer"> <div class="primaryDetailsContainer">
<div class="detailNameContainer"> <div class="detailNameContainer">
<div class="parentName"></div> <div class="parentName"></div>
<h1 class="itemName" style="margin:0;"></h1> <h1 class="itemName"></h1>
<div class="desktopDetails itemMiscInfo" style="margin-top:.5em;"> <div class="desktopDetails itemMiscInfo" style="margin-top:.5em;">
</div> </div>

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff