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

another global var

Browse source
This commit is contained in:
rolux 2011-11-06 22:03:24 +00:00
parent 5929e34dc8
commit cfe7282a24
2 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
static/js/pandora/folders.js
View file

@ -270,30 +270,32 @@ pandora.ui.folders = function() {
}).bindEvent({ }).bindEvent({
click: function() { click: function() {
var $dialog = Ox.Dialog({ var $dialog = Ox.Dialog({
buttons: Ox.merge( buttons: title != 'Featured Lists' ? [
title != 'Featured Lists' ? [ Ox.Button({title: 'Sign Up...'}).bindEvent({
Ox.Button({title: 'Sign Up...'}).bindEvent({ click: function() {
click: function() { $dialog.close();
$dialog.close(); pandora.$ui.accountDialog = pandora.ui.accountDialog('signup').open();
pandora.$ui.accountDialog = pandora.ui.accountDialog('signup').open(); }
} }),
}), Ox.Button({title: 'Sign In...'}).bindEvent({
Ox.Button({title: 'Sign In...'}).bindEvent({ click: function() {
click: function() { $dialog.close();
$dialog.close(); pandora.$ui.accountDialog = pandora.ui.accountDialog('signin').open();
pandora.$ui.accountDialog = pandora.ui.accountDialog('signin').open(); }
} }),
}), {},
{} Ox.Button({title: 'Not Now'}).bindEvent({
] : [], click: function() {
[ $dialog.close();
Ox.Button({title: 'Close'}).bindEvent({ }
click: function() { })
$dialog.close(); ] : [
} Ox.Button({title: 'Close'}).bindEvent({
}) click: function() {
] $dialog.close();
), }
})
],
content: Ox.Element() content: Ox.Element()
.append( .append(
$('<img>') $('<img>')

5
static/js/pandora/rightPanel.js
View file

@ -20,12 +20,13 @@ pandora.ui.rightPanel = function() {
}) })
.bindEvent({ .bindEvent({
resize: function(data) { resize: function(data) {
var clipsItems, previousClipsItems;
if (!pandora.user.ui.item) { if (!pandora.user.ui.item) {
pandora.resizeFilters(); pandora.resizeFilters();
pandora.$ui.list.size(); pandora.$ui.list.size();
if (pandora.user.ui.listView == 'clips') { if (pandora.user.ui.listView == 'clips') {
var clipsItems = pandora.getClipsItems(); clipsItems = pandora.getClipsItems();
previousClipsItems = pandora.getClipsItems(pandora.$ui.list.options('width')); previousClipsItems = pandora.getClipsItems(pandora.$ui.list.options('width'));
pandora.$ui.list.options({width: data.size}); pandora.$ui.list.options({width: data.size});
if (clipsItems != previousClipsItems) { if (clipsItems != previousClipsItems) {
Ox.Request.clearCache(); // fixme Ox.Request.clearCache(); // fixme