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

links

Browse source
This commit is contained in:
j 2012-01-17 21:14:09 +05:30
parent 2f92d5d2aa
commit 41d5f886c7
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/padma.jsonc
View file

@ -529,7 +529,7 @@
"clipsColumns": 2, "clipsColumns": 2,
"columns": { "columns": {
"Colors": { "Colors": {
"columns": ["title", "director", "location", "source", "hue", "saturation", "brightness"], "columns": ["title", "source", "project", "language", "hue", "saturation", "brightness"],
"columnWidth": {} "columnWidth": {}
} }
}, },
@ -549,7 +549,7 @@
"itemFind": {"conditions": [], "operator": "&"}, "itemFind": {"conditions": [], "operator": "&"},
"itemSort": [{"key": "position", "operator": "+"}], "itemSort": [{"key": "position", "operator": "+"}],
"itemView": "info", "itemView": "info",
"listColumns": ["title", "director", "location", "source", "language", "duration"], "listColumns": ["title", "source", "project", "director", "language", "duration"],
"listColumnWidth": {}, "listColumnWidth": {},
"listSelection": [], "listSelection": [],
"listSort": [{"key": "title", "operator": "+"}], "listSort": [{"key": "title", "operator": "+"}],

2
static/js/pandora/infoView.padma.js
View file

@ -132,7 +132,7 @@ pandora.ui.infoView = function(data) {
$browserImages = []; $browserImages = [];
pandora.createLinks($text); //pandora.createLinks($text);
// Title ------------------------------------------------------------------- // Title -------------------------------------------------------------------

4
static/js/pandora/item.js
View file

@ -125,7 +125,8 @@ pandora.ui.item = function() {
annotationsRange: pandora.user.ui.annotationsRange, annotationsRange: pandora.user.ui.annotationsRange,
annotationsSize: pandora.user.ui.annotationsSize, annotationsSize: pandora.user.ui.annotationsSize,
annotationsSort: pandora.user.ui.annotationsSort, annotationsSort: pandora.user.ui.annotationsSort,
censored: videoOptions.censored, censored: videoOptions.censored,
clickLink: pandora.clickLink,
cuts: result.data.cuts || [], cuts: result.data.cuts || [],
duration: result.data.duration, duration: result.data.duration,
enableSubtitles: pandora.user.ui.videoSubtitles, enableSubtitles: pandora.user.ui.videoSubtitles,
@ -225,6 +226,7 @@ pandora.ui.item = function() {
annotationsSize: pandora.user.ui.annotationsSize, annotationsSize: pandora.user.ui.annotationsSize,
annotationsSort: pandora.user.ui.annotationsSort, annotationsSort: pandora.user.ui.annotationsSort,
censored: videoOptions.censored, censored: videoOptions.censored,
clickLink: pandora.clickLink,
cuts: result.data.cuts || [], cuts: result.data.cuts || [],
duration: result.data.duration, duration: result.data.duration,
enableSubtitles: pandora.user.ui.videoSubtitles, enableSubtitles: pandora.user.ui.videoSubtitles,

2
static/js/pandora/utils.js
View file

@ -177,7 +177,7 @@ pandora.clickLink = function(e) {
if (e.target.hostname == document.location.hostname) { if (e.target.hostname == document.location.hostname) {
pandora.URL.push(e.target.pathname); pandora.URL.push(e.target.pathname);
} else { } else {
document.location.href = '/url=' + encodeURIComponent(e.target.href); window.open('/url=' + encodeURIComponent(e.target.href), '_blank');
} }
}; };