merge

static/js/api/pandora.js

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

static/js/pandora/allItems.js

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

static/js/pandora/contactForm.js

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

static/js/pandora/folderList.js

@@ -279,7 +279,7 @@ pandora.ui.folderList = function(id) {
                 } else if (id == 'favorite' || (id == 'featured' && pandora.user.level == 'admin')) {
                     // this makes the button trigger a change event,
                     // 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) {
                         pandora.site.sectionFolders.items[i].showBrowser = true;

static/js/pandora/sectionbar.js

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