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

use MenuButton

Browse source
This commit is contained in:
rolux 2011-12-20 12:50:23 +05:30
parent 47c5b51bdb
commit 948423fee4
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ pandora.ui.folders = function() {
]; ];
} else { } else {
extras = [ extras = [
pandora.$ui.personalListsSelect = Ox.Select({ pandora.$ui.personalListsSelect = Ox.MenuButton({
items: [ items: [
{ id: 'newlist', title: 'New List' }, { id: 'newlist', title: 'New List' },
{ id: 'newlistfromselection', title: 'New List from Selection...', disabled: ui.listSelection.length == 0 }, { id: 'newlistfromselection', title: 'New List from Selection...', disabled: ui.listSelection.length == 0 },
@ -39,8 +39,7 @@ pandora.ui.folders = function() {
{ id: 'editlist', title: 'Edit Selected List...', disabled: !pandora.user.ui._list }, { id: 'editlist', title: 'Edit Selected List...', disabled: !pandora.user.ui._list },
{ id: 'deletelist', title: 'Delete Selected List...', disabled: !pandora.user.ui._list } { id: 'deletelist', title: 'Delete Selected List...', disabled: !pandora.user.ui._list }
], ],
selectable: false, title: 'set',
title: 'set', // FIXME: why does this work in VideoEditor, but not here?
tooltip: 'Manage Personal Lists', tooltip: 'Manage Personal Lists',
type: 'image' type: 'image'
}) })
@ -183,7 +182,7 @@ pandora.ui.folders = function() {
if (pandora.user.level == 'guest') { if (pandora.user.level == 'guest') {
extras = [infoButton('Local Volumes', 'To import movies from a local disk, please sign up or sign in.')]; extras = [infoButton('Local Volumes', 'To import movies from a local disk, please sign up or sign in.')];
} else { } else {
extras = [Ox.Select({ extras = [Ox.MenuButton({
items: [ items: [
{ id: 'add', title: 'Add Volume...', disabled: true }, { id: 'add', title: 'Add Volume...', disabled: true },
{ id: 'scan', title: 'Scan Selected Volume...', disabled: true }, { id: 'scan', title: 'Scan Selected Volume...', disabled: true },
@ -191,9 +190,8 @@ pandora.ui.folders = function() {
{}, {},
{ id: 'import', title: 'Import Movies...', disabled: true } { id: 'import', title: 'Import Movies...', disabled: true }
], ],
max: 0, title: 'set',
min: 0, tooltip: 'Manage Volumes',
selectable: false,
type: 'image' type: 'image'
}) })
.bindEvent({ .bindEvent({

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

@ -4,9 +4,9 @@
pandora.ui.sortMenu = function() { pandora.ui.sortMenu = function() {
// fixme: unused // FIXME: unused
var that = Ox.Select({ var that = Ox.MenuButton({
items: Ox.merge( items: Ox.merge(
pandora.site.clipKeys.map(function(key) { pandora.site.clipKeys.map(function(key) {
return Ox.extend(Ox.clone(key), { return Ox.extend(Ox.clone(key), {
@ -21,7 +21,6 @@ pandora.ui.sortMenu = function() {
{id: 'descending', title: 'Descending', checked: pandora.user.ui.itemSort[0].operator == '-'} {id: 'descending', title: 'Descending', checked: pandora.user.ui.itemSort[0].operator == '-'}
] ]
), ),
selectable: false,
tooltip: 'Sort clips', tooltip: 'Sort clips',
type: 'image' type: 'image'
}) })

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

@ -609,13 +609,12 @@ pandora.ui.usersDialog = function() {
.bindEvent({ .bindEvent({
change: setSend change: setSend
}), }),
Ox.Select({ Ox.MenuButton({
id: 'insert', id: 'insert',
items: [ items: [
{id: 'username', title: 'Username'}, {id: 'username', title: 'Username'},
{id: 'email', title: 'E-Mail address'}, {id: 'email', title: 'E-Mail address'},
], ],
selectable: false,
title: 'Insert...', title: 'Insert...',
width: formWidth - 16 width: formWidth - 16
}) })