From b0f12e5ac38995c4296bec267fd2b084c0034499 Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 11 Nov 2011 15:15:13 +0000 Subject: [PATCH] misc fixes (disable special theme for firefox, keep vertical scrollbar in movies browser from appearing in firefox) --- pandora/0xdb.jsonc | 11 ++++------- static/js/pandora.js | 2 ++ static/js/pandora/account.js | 1 + static/js/pandora/browser.js | 1 + static/js/pandora/utils.js | 10 ---------- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/pandora/0xdb.jsonc b/pandora/0xdb.jsonc index bb3fa53a..8f407e0e 100644 --- a/pandora/0xdb.jsonc +++ b/pandora/0xdb.jsonc @@ -534,13 +534,10 @@ "importPosterFrames": true }, "personalLists": [ - {"id": "favorites", "title": "Favorites"}, - {"id": "most_popular", "title": "Most Popular", "query": {}}, - {"id": "recently_viewed", "title": "Recently Viewed", "query": {}}, - {"id": "1960s", "title": "1960s", "query": {"conditions": [{"key": "year", "value": ["1960", "1970"], "operator": "="}], "operator": "&"}}, - {"id": "movies_with_full_video", "title": "Movies with Full Video", "query": {"conditions": [{"key": "canplayvideo", "value": true, "operator": "="}], "operator": "&"}}, - {"id": "movies_with_clips", "title": "Movies with Clips", "query": {"conditions": [{"key": "canplayclips", "value": true, "operator": "="}], "operator": "&"}}, - {"id": "no_tv_series", "title": "No TV Series", "query": {"conditions": [{"key": "series", "value": false, "operator": "="}], "operator": "&"}} + {"title": "Favorites"}, + {"title": "1960s", "query": {"conditions": [{"key": "year", "value": ["1960", "1970"], "operator": "="}], "operator": "&"}}, + //{"title": "Movies with Video", "query": {"conditions": [{"key": "canplayvideo", "value": "true", "operator": "="}], "operator": "&"}}, + //{"title": "Movies with Clips", "query": {"conditions": [{"key": "canplayclips", "value": "true", "operator": "="}], "operator": "&"}} ], "rightsLevel": {"member": 4, "staff": 3, "admin": 2}, "rightsLevels": [ diff --git a/static/js/pandora.js b/static/js/pandora.js index ec2a9027..e7262acd 100644 --- a/static/js/pandora.js +++ b/static/js/pandora.js @@ -262,9 +262,11 @@ appPanel videoFormat: Ox.UI.getVideoFormat(pandora.site.video.formats) }); + /* disabled if (data.user.level == 'guest' && $.browser.mozilla && !localStorage.OxTheme) { pandora.user.ui.theme = 'classic'; } + */ // set up url controller diff --git a/static/js/pandora/account.js b/static/js/pandora/account.js index 4fa5b4fb..3fe12e6c 100644 --- a/static/js/pandora/account.js +++ b/static/js/pandora/account.js @@ -326,6 +326,7 @@ pandora.ui.accountSignoutDialog = function() { title: 'Sign Out' }).bindEvent('click', function() { that.close(); + pandora.UI.set({page: ''}); pandora.api.signout({}, function(result) { pandora.signout(result.data); }); diff --git a/static/js/pandora/browser.js b/static/js/pandora/browser.js index 415b7c93..b4e64796 100644 --- a/static/js/pandora/browser.js +++ b/static/js/pandora/browser.js @@ -103,6 +103,7 @@ pandora.ui.browser = function() { ? pandora.site.user.ui.listSort: pandora.user.ui.listSort, unique: 'id' }) + .css({overflowY: 'hidden'}) // this fixes a bug in firefox .bindEvent({ open: function() { that.scrollToSelection(); diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js index c8e1efcb..afccc6b6 100644 --- a/static/js/pandora/utils.js +++ b/static/js/pandora/utils.js @@ -974,16 +974,6 @@ pandora.unloadWindow = function() { */ }; -pandora.updateFindElement = function() { - var findState = pandora.user.ui._findState; - pandora.$ui.findSelect.value(findState.key); - pandora.$ui.findInput.options( - findState.key == 'advanced' - ? {placeholder: 'Edit Query...', value: ''} - : {placeholder: '', value: findState.value} - ); -}; - (function() { // Note: getFindState has to run after getListState and getFilterState