decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

wrap image urls in pandora.getMediaURL to add option to load image from another domain

Browse source
This commit is contained in:
j 2014-02-02 11:30:25 +00:00 • committed by rolux
commit 522af49a73
22 changed files with 118 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/editPanel.js
View file

@ -98,7 +98,7 @@ pandora.ui.editPanel = function() {
fullscreen: false,
getClipImageURL: function(id, width, height) {
var clip = Ox.getObjectById(edit.clips, id);
return '/' + clip.item + '/' + height + 'p' + clip['in'] + '.jpg';
return pandora.getMediaURL('/' + clip.item + '/' + height + 'p' + clip['in'] + '.jpg');
},
getLargeTimelineURL: function(type, i, callback) {
pandora.getLargeEditTimelineURL(edit, type, i, callback);
@ -348,7 +348,7 @@ pandora.ui.editPanel = function() {
item: function(data, sort, size) {
size = size || 128;
var ui = pandora.user.ui,
url = '/edit/' + data.id + '/icon' + size + '.jpg?' + data.modified,
url = pandora.getMediaURL('/edit/' + data.id + '/icon' + size + '.jpg?' + data.modified),
info = Ox.formatDuration(data.duration);
return {
height: size,