0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

fix #2118 (document.title: '– sitename' should come last)

Browse source
This commit is contained in:
rolux 2014-02-02 18:39:01 +00:00
parent cf0ee0d34d
commit 7838120a92
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
static/js/utils.js
View file

@ -924,7 +924,7 @@ pandora.getClipVideos = function(clip, resolution) {
(function() { (function() {
var itemTitles = {}; var itemTitles = {};
pandora.getDocumentTitle = function(itemData) { pandora.getDocumentTitle = function(itemData) {
var parts = [pandora.site.site.name]; var parts = [];
if (itemData) { if (itemData) {
itemTitles[pandora.user.ui.item] = Ox.decodeHTMLEntities(pandora.getItemTitle(itemData)); itemTitles[pandora.user.ui.item] = Ox.decodeHTMLEntities(pandora.getItemTitle(itemData));
} }
@ -941,12 +941,12 @@ pandora.getClipVideos = function(clip, resolution) {
} else if (pandora.user.ui.section == 'texts') { } else if (pandora.user.ui.section == 'texts') {
parts.push(pandora.user.ui.text ? Ox._('Text') + ' ' + pandora.user.ui.text : Ox._('Texts')); parts.push(pandora.user.ui.text ? Ox._('Text') + ' ' + pandora.user.ui.text : Ox._('Texts'));
} }
parts.push(pandora.site.site.name);
return parts.join(' – '); return parts.join(' – ');
}; };
}()); }());
pandora.getDownloadLink = function(item, rightslevel) { pandora.getDownloadLink = function(item, rightslevel) {
console.log('pandora.getDownloadLink', item, rightslevel);
var torrent = pandora.site.video.torrent; var torrent = pandora.site.video.torrent;
if (arguments.length == 2 && torrent && if (arguments.length == 2 && torrent &&
pandora.site.capabilities.canSeeItem.guest < rightslevel) { pandora.site.capabilities.canSeeItem.guest < rightslevel) {
@ -1367,8 +1367,7 @@ pandora.getPageTitle = function(stateOrURL) {
Ox.isObject(stateOrURL) ? stateOrURL.page : stateOrURL.slice(1) Ox.isObject(stateOrURL) ? stateOrURL.page : stateOrURL.slice(1)
); );
return page return page
? pandora.site.site.name ? (page.title ? page.title + ' – ' : '') + pandora.site.site.name
+ (page.title ? ' – ' + page.title : '')
: null; : null;
}; };