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

fix yesterday labels

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-25 00:53:12 -04:00
parent 870c5e2f2d
commit 06f03fdbf3
5 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.185", "version": "1.4.186",
"_release": "1.4.185", "_release": "1.4.186",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.185", "tag": "1.4.186",
"commit": "6654b9cfd6b703fd864f5e59004db1991a0d26be" "commit": "58f6ba7c53f72e861456632e6c278b6d9da2bf9b"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

14
dashboard-ui/bower_components/emby-webcomponents/datetime.js vendored
View file

@ -104,7 +104,7 @@
}(); }();
function toLocaleDateString(date) { function toLocaleDateString(date) {
var currentLocale = globalize.getCurrentLocale(); var currentLocale = globalize.getCurrentLocale();
return currentLocale && toLocaleTimeStringSupportsLocales ? return currentLocale && toLocaleTimeStringSupportsLocales ?
@ -160,10 +160,20 @@
return time; return time;
} }
function isRelativeDay(date, offsetInDays) {
var yesterday = new Date();
var day = yesterday.getDate() + offsetInDays;
yesterday.setDate(day); // automatically adjusts month/year appropriately
return date.getFullYear() == yesterday.getFullYear() && date.getMonth() == yesterday.getMonth() && date.getDate() == day;
}
return { return {
parseISO8601Date: parseISO8601Date, parseISO8601Date: parseISO8601Date,
getDisplayRunningTime: getDisplayRunningTime, getDisplayRunningTime: getDisplayRunningTime,
toLocaleDateString: toLocaleDateString, toLocaleDateString: toLocaleDateString,
getDisplayTime: getDisplayTime getDisplayTime: getDisplayTime,
isRelativeDay: isRelativeDay
}; };
}); });

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

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

2
dashboard-ui/scripts/homeupcoming.js
View file

@ -64,7 +64,7 @@
var premiereDate = datetime.parseISO8601Date(item.PremiereDate, true); var premiereDate = datetime.parseISO8601Date(item.PremiereDate, true);
if (premiereDate.getDate() == new Date().getDate() - 1) { if (datetime.isRelativeDay(premiereDate, -1)) {
dateText = Globalize.translate('Yesterday'); dateText = Globalize.translate('Yesterday');
} else { } else {
dateText = LibraryBrowser.getFutureDateText(premiereDate, true); dateText = LibraryBrowser.getFutureDateText(premiereDate, true);

2
dashboard-ui/scripts/tvupcoming.js
View file

@ -66,7 +66,7 @@
var premiereDate = datetime.parseISO8601Date(item.PremiereDate, true); var premiereDate = datetime.parseISO8601Date(item.PremiereDate, true);
if (premiereDate.getDate() == new Date().getDate() - 1) { if (datetime.isRelativeDay(premiereDate, -1)) {
dateText = Globalize.translate('Yesterday'); dateText = Globalize.translate('Yesterday');
} else { } else {
dateText = libraryBrowser.getFutureDateText(premiereDate, true); dateText = libraryBrowser.getFutureDateText(premiereDate, true);