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

fix resize bugs in calendar, list calendar etc

Browse source
This commit is contained in:
rolux 2012-01-30 22:11:30 +00:00
parent 5449adb7ae
commit ddf8655959
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
static/js/pandora/eventsDialog.js
View file

@ -55,7 +55,8 @@ pandora.ui.eventsDialog = function() {
$content && $content.options({height: data.height}); $content && $content.options({height: data.height});
}, },
resizeend: function(data) { resizeend: function(data) {
$content && $content.options(data); Ox.print('RESIZEEND', data)
$content && $content.options({height: data.height, width: data.width});
} }
}), }),
$content; $content;

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

@ -226,6 +226,7 @@ pandora.ui.item = function() {
clickLink: pandora.clickLink, clickLink: pandora.clickLink,
cuts: result.data.cuts || [], cuts: result.data.cuts || [],
duration: result.data.duration, duration: result.data.duration,
download: pandora.site.video.download,
enableSubtitles: pandora.user.ui.videoSubtitles, enableSubtitles: pandora.user.ui.videoSubtitles,
find: pandora.user.ui.itemFind.conditions[0] find: pandora.user.ui.itemFind.conditions[0]
? pandora.user.ui.itemFind.conditions[0].value : '', ? pandora.user.ui.itemFind.conditions[0].value : '',
@ -299,6 +300,12 @@ pandora.ui.item = function() {
pandora.$ui.placesDialog && pandora.$ui.placesDialog.remove(); pandora.$ui.placesDialog && pandora.$ui.placesDialog.remove();
pandora.$ui.placesDialog = pandora.ui.placesDialog(data).open(); pandora.$ui.placesDialog = pandora.ui.placesDialog(data).open();
}, },
download: function(data) {
Ox.print('download', data);
document.location.href = '/' + pandora.user.ui.item + '/download';
},
downloadSelection: function(data) {
},
editannotation: function(data) { editannotation: function(data) {
Ox.Log('', 'editAnnotation', data); Ox.Log('', 'editAnnotation', data);
//fixme: check that edit was successfull //fixme: check that edit was successfull
@ -315,6 +322,10 @@ pandora.ui.item = function() {
pandora.$ui.editor.updateAnnotation(result.data); pandora.$ui.editor.updateAnnotation(result.data);
}); });
}, },
embedSelection: function(data) {
pandora.$ui.embedDialog && pandora.$ui.embedDialog.remove();
pandora.$ui.embedDialog = pandora.ui.embedDialog(data).open();
},
find: function(data) { find: function(data) {
pandora.UI.set('itemFind', data.find ? { pandora.UI.set('itemFind', data.find ? {
conditions: [{key: 'annotations', value: data.find, operator: '='}], conditions: [{key: 'annotations', value: data.find, operator: '='}],