From 126d2e2df078c6dfc942b1c9a56e351a0e93bd79 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rollux.org>
Date: Thu, 13 Oct 2011 12:47:11 +0000
Subject: [PATCH] fix a bug in the url controller that would lead to certain
 valid item views not being recognized

---
 static/js/pandora/URL.js           | 4 ++--
 static/js/pandora/ui/viewSelect.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/js/pandora/URL.js b/static/js/pandora/URL.js
index 49a0acb7..60dfdd58 100644
--- a/static/js/pandora/URL.js
+++ b/static/js/pandora/URL.js
@@ -262,9 +262,9 @@ pandora.URL = (function() {
                 // itemView is the default view,
                 // videoView is the default view if there is a duration
                 [pandora.user.ui.itemView, pandora.user.ui.videoView],
-                pandora.site.itemViews.map(function(view) {
+                Ox.map(pandora.site.itemViews, function(view) {
                     return [
-                        'info', pandora.user.ui.videoView
+                        pandora.user.ui.itemView, pandora.user.ui.videoView
                     ].indexOf(view.id) > -1 ? null : view.id;
                 })
             )
diff --git a/static/js/pandora/ui/viewSelect.js b/static/js/pandora/ui/viewSelect.js
index 2c247202..2398142a 100644
--- a/static/js/pandora/ui/viewSelect.js
+++ b/static/js/pandora/ui/viewSelect.js
@@ -32,7 +32,7 @@ pandora.ui.viewSelect = function() {
                     if (pandora.isClipView(key)) {
                         // ... to a clip view, set listSelection to empty
                         set.listSelection = [];
-                    } else if (['title', 'position'].indexOf(ui.listSort[0].key) > -1) {
+                    } else if (['text', 'position'].indexOf(ui.listSort[0].key) > -1) {
                         // ... to a non-clip view, with a sort key that only exists
                         // in clip views, reset listSort to the default listSort
                         set.listSort = pandora.site.user.ui.listSort;