From 6406a6506c45467574dc827cde145fa46eba44de Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Wed, 1 Jun 2011 15:16:50 +0200 Subject: [PATCH] find --- pandora/0xdb.json | 1 + static/js/pandora/ui/contentPanel.js | 2 +- static/js/pandora/ui/findElement.js | 2 +- static/js/pandora/ui/item.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pandora/0xdb.json b/pandora/0xdb.json index 1541a8a..c8f3b52 100644 --- a/pandora/0xdb.json +++ b/pandora/0xdb.json @@ -16,6 +16,7 @@ { "id": "all", "title": "All", + "type": "string", "find": true }, { diff --git a/static/js/pandora/ui/contentPanel.js b/static/js/pandora/ui/contentPanel.js index 23b1e05..22dd0b7 100644 --- a/static/js/pandora/ui/contentPanel.js +++ b/static/js/pandora/ui/contentPanel.js @@ -25,7 +25,7 @@ pandora.ui.contentPanel = function() { } ], orientation: 'vertical' - }) + }); return that; }; diff --git a/static/js/pandora/ui/findElement.js b/static/js/pandora/ui/findElement.js index 53d237e..a0e9c40 100644 --- a/static/js/pandora/ui/findElement.js +++ b/static/js/pandora/ui/findElement.js @@ -98,7 +98,7 @@ pandora.ui.findElement = function() { function autocompleteFunction() { return app.user.ui.findQuery.conditions.length ? function(value, callback) { var elementValue = that.value(), - key = elementValue[app.user.ui.list ? 1 : 0].id, + key = elementValue[app.user.ui.list ? 1 : 0], findKey = Ox.getObjectById(app.ui.findKeys, key); Ox.print('!!!!', key, findKey, 'autocomplete' in findKey && findKey.autocomplete) value === '' && Ox.print('Warning: autocomplete function should never be called with empty value'); diff --git a/static/js/pandora/ui/item.js b/static/js/pandora/ui/item.js index a27898b..eaeb4f4 100644 --- a/static/js/pandora/ui/item.js +++ b/static/js/pandora/ui/item.js @@ -109,7 +109,7 @@ pandora.ui.item = function() { } else if (app.user.ui.itemView == 'timeline') { var layers = [], video = result.data.stream, - cuts = result.data.cuts || {}, + cuts = result.data.cuts || [], format = $.support.video.supportedFormat(video.formats), streams = {}; video.height = video.profiles[0];