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

merge

Browse source
This commit is contained in:
rolux 2011-12-22 07:28:17 +00:00
commit cfb8d4f6a4
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/js/api/pandora.js
View file

@ -133,11 +133,11 @@ function constructList() {
.html(app.actions[id].code[1].replace('/\n/<br>\n/g')) .html(app.actions[id].code[1].replace('/\n/<br>\n/g'))
.hide(); .hide();
var $button = new Ox.Button({ var $button = new Ox.Button({
title: [ type: "image"
values: [
{id: "one", title: "right"}, {id: "one", title: "right"},
{id: "two", title: "down"}, {id: "two", title: "down"},
], ],
type: "image"
}) })
.addClass("margin") .addClass("margin")
.click(function() { $code.toggle()}) .click(function() { $code.toggle()})

2
static/js/pandora/allItems.js
View file

@ -3,7 +3,7 @@
pandora.ui.allItems = function() { pandora.ui.allItems = function() {
var that = Ox.Element() var that = Ox.Element()
.addClass('OxSelectable' + (pandora.user.ui._list ? '' : ' OxSelected')) .addClass('OxSelectableElement' + (pandora.user.ui._list ? '' : ' OxSelected'))
.css({ .css({
height: '16px', height: '16px',
cursor: 'default', cursor: 'default',

4
static/js/pandora/contactForm.js
View file

@ -66,9 +66,7 @@ pandora.ui.contactForm = function() {
.css({width: width + 'px'}) .css({width: width + 'px'})
.bindEvent({ .bindEvent({
validate: function(data) { validate: function(data) {
$sendButton.options({ $sendButton.options({disabled: !data.valid});
disabled: !data.valid
});
} }
}) })
.appendTo(that), .appendTo(that),

2
static/js/pandora/folderList.js
View file

@ -279,7 +279,7 @@ pandora.ui.folderList = function(id) {
} else if (id == 'favorite' || (id == 'featured' && pandora.user.level == 'admin')) { } else if (id == 'favorite' || (id == 'featured' && pandora.user.level == 'admin')) {
// this makes the button trigger a change event, // this makes the button trigger a change event,
// which is already being handled in folders.js // which is already being handled in folders.js
pandora.$ui.manageListsButton[id].options({selected: true}); pandora.$ui.manageListsButton[id].options({value: true});
/* /*
if (!pandora.site.sectionFolders.items[i].showBrowser) { if (!pandora.site.sectionFolders.items[i].showBrowser) {
pandora.site.sectionFolders.items[i].showBrowser = true; pandora.site.sectionFolders.items[i].showBrowser = true;

6
static/js/pandora/sectionbar.js
View file

@ -5,9 +5,9 @@ pandora.ui.sectionbar = function(mode) {
size: 24 size: 24
}) })
.append( .append(
mode == 'buttons' ? mode == 'buttons'
pandora.$ui.sectionButtons = pandora.ui.sectionButtons() : ? pandora.$ui.sectionButtons = pandora.ui.sectionButtons()
pandora.$ui.sectionSelect = pandora.ui.sectionSelect() : pandora.$ui.sectionSelect = pandora.ui.sectionSelect()
); );
that.toggle = function() { that.toggle = function() {