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

fix window resize

Browse source
This commit is contained in:
rolux 2012-04-17 14:54:04 +00:00
parent 2e09efbe53
commit 24ccb3209b
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -663,7 +663,7 @@ pandora.getMetadataByIdOrName = function(item, view, str, callback) {
Ox.Log('URL', 'getMetadataByIdOrName', item, view, str); Ox.Log('URL', 'getMetadataByIdOrName', item, view, str);
var isName = str[0] == '@', var isName = str[0] == '@',
canBeAnnotation = ( canBeAnnotation = (
!view || view == 'timeline' || view == 'player' || view == 'editor' !view || view == 'video' || view == 'timeline'
) && item && !isName, ) && item && !isName,
canBeEvent = !view || view == 'calendar', canBeEvent = !view || view == 'calendar',
canBePlace = !view || view == 'map'; canBePlace = !view || view == 'map';
@ -1063,7 +1063,7 @@ pandora.resizeWindow = function() {
pandora.$ui.item.resize(); pandora.$ui.item.resize();
} else if (pandora.user.ui.itemView == 'clips') { } else if (pandora.user.ui.itemView == 'clips') {
pandora.$ui.clipList.size(); pandora.$ui.clipList.size();
} else if (pandora.user.ui.itemView == 'timeline') { } else if (pandora.user.ui.itemVide == 'timeline') {
pandora.$ui.timeline && pandora.$ui.timeline.options({ pandora.$ui.timeline && pandora.$ui.timeline.options({
// fixme: duplicated // fixme: duplicated
height: pandora.$ui.contentPanel.size(1), height: pandora.$ui.contentPanel.size(1),
@ -1127,10 +1127,12 @@ pandora.unloadWindow = function() {
// fixme: ajax request has to have async set to false for this to work // fixme: ajax request has to have async set to false for this to work
pandora.user.ui.section == 'items' pandora.user.ui.section == 'items'
&& pandora.user.ui.item && pandora.user.ui.item
&& ['timeline', 'player', 'editor'].indexOf(pandora.user.ui.itemView) > -1 && ['video', 'timeline'].indexOf(pandora.user.ui.itemView) > -1
&& pandora.UI.set( && pandora.UI.set(
'videoPosition.' + pandora.user.ui.item, 'videoPosition.' + pandora.user.ui.item,
pandora.$ui[pandora.user.ui.itemView].options('position') pandora.$ui[
pandora.user.ui.itemView == 'video' ? 'player' : 'editor'
].options('position')
); );
*/ */
}; };