misc fixes (disable special theme for firefox, keep vertical scrollbar in movies browser from appearing in firefox)

This commit is contained in:
rolux 2011-11-11 15:15:13 +00:00
parent 9aff249881
commit b0f12e5ac3
5 changed files with 8 additions and 17 deletions

View file

@ -534,13 +534,10 @@
"importPosterFrames": true "importPosterFrames": true
}, },
"personalLists": [ "personalLists": [
{"id": "favorites", "title": "Favorites"}, {"title": "Favorites"},
{"id": "most_popular", "title": "Most Popular", "query": {}}, {"title": "1960s", "query": {"conditions": [{"key": "year", "value": ["1960", "1970"], "operator": "="}], "operator": "&"}},
{"id": "recently_viewed", "title": "Recently Viewed", "query": {}}, //{"title": "Movies with Video", "query": {"conditions": [{"key": "canplayvideo", "value": "true", "operator": "="}], "operator": "&"}},
{"id": "1960s", "title": "1960s", "query": {"conditions": [{"key": "year", "value": ["1960", "1970"], "operator": "="}], "operator": "&"}}, //{"title": "Movies with Clips", "query": {"conditions": [{"key": "canplayclips", "value": "true", "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": "&"}}
], ],
"rightsLevel": {"member": 4, "staff": 3, "admin": 2}, "rightsLevel": {"member": 4, "staff": 3, "admin": 2},
"rightsLevels": [ "rightsLevels": [

View file

@ -262,9 +262,11 @@ appPanel
videoFormat: Ox.UI.getVideoFormat(pandora.site.video.formats) videoFormat: Ox.UI.getVideoFormat(pandora.site.video.formats)
}); });
/* disabled
if (data.user.level == 'guest' && $.browser.mozilla && !localStorage.OxTheme) { if (data.user.level == 'guest' && $.browser.mozilla && !localStorage.OxTheme) {
pandora.user.ui.theme = 'classic'; pandora.user.ui.theme = 'classic';
} }
*/
// set up url controller // set up url controller

View file

@ -326,6 +326,7 @@ pandora.ui.accountSignoutDialog = function() {
title: 'Sign Out' title: 'Sign Out'
}).bindEvent('click', function() { }).bindEvent('click', function() {
that.close(); that.close();
pandora.UI.set({page: ''});
pandora.api.signout({}, function(result) { pandora.api.signout({}, function(result) {
pandora.signout(result.data); pandora.signout(result.data);
}); });

View file

@ -103,6 +103,7 @@ pandora.ui.browser = function() {
? pandora.site.user.ui.listSort: pandora.user.ui.listSort, ? pandora.site.user.ui.listSort: pandora.user.ui.listSort,
unique: 'id' unique: 'id'
}) })
.css({overflowY: 'hidden'}) // this fixes a bug in firefox
.bindEvent({ .bindEvent({
open: function() { open: function() {
that.scrollToSelection(); that.scrollToSelection();

View file

@ -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() { (function() {
// Note: getFindState has to run after getListState and getFilterState // Note: getFindState has to run after getListState and getFilterState