From 948423fee460340a65ba971c679a4a67db1df58c Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 20 Dec 2011 12:50:23 +0530 Subject: [PATCH] use MenuButton --- static/js/pandora/folders.js | 12 +++++------- static/js/pandora/sortMenu.js | 5 ++--- static/js/pandora/usersDialog.js | 3 +-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/static/js/pandora/folders.js b/static/js/pandora/folders.js index 037a62de..7dac9b04 100644 --- a/static/js/pandora/folders.js +++ b/static/js/pandora/folders.js @@ -28,7 +28,7 @@ pandora.ui.folders = function() { ]; } else { extras = [ - pandora.$ui.personalListsSelect = Ox.Select({ + pandora.$ui.personalListsSelect = Ox.MenuButton({ items: [ { id: 'newlist', title: 'New List' }, { 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: 'deletelist', title: 'Delete Selected List...', disabled: !pandora.user.ui._list } ], - selectable: false, - title: 'set', // FIXME: why does this work in VideoEditor, but not here? + title: 'set', tooltip: 'Manage Personal Lists', type: 'image' }) @@ -183,7 +182,7 @@ pandora.ui.folders = function() { if (pandora.user.level == 'guest') { extras = [infoButton('Local Volumes', 'To import movies from a local disk, please sign up or sign in.')]; } else { - extras = [Ox.Select({ + extras = [Ox.MenuButton({ items: [ { id: 'add', title: 'Add 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 } ], - max: 0, - min: 0, - selectable: false, + title: 'set', + tooltip: 'Manage Volumes', type: 'image' }) .bindEvent({ diff --git a/static/js/pandora/sortMenu.js b/static/js/pandora/sortMenu.js index 70becfef..906d895c 100644 --- a/static/js/pandora/sortMenu.js +++ b/static/js/pandora/sortMenu.js @@ -4,9 +4,9 @@ pandora.ui.sortMenu = function() { - // fixme: unused + // FIXME: unused - var that = Ox.Select({ + var that = Ox.MenuButton({ items: Ox.merge( pandora.site.clipKeys.map(function(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 == '-'} ] ), - selectable: false, tooltip: 'Sort clips', type: 'image' }) diff --git a/static/js/pandora/usersDialog.js b/static/js/pandora/usersDialog.js index 3f128d19..c7db8121 100644 --- a/static/js/pandora/usersDialog.js +++ b/static/js/pandora/usersDialog.js @@ -609,13 +609,12 @@ pandora.ui.usersDialog = function() { .bindEvent({ change: setSend }), - Ox.Select({ + Ox.MenuButton({ id: 'insert', items: [ {id: 'username', title: 'Username'}, {id: 'email', title: 'E-Mail address'}, ], - selectable: false, title: 'Insert...', width: formWidth - 16 })