From dbbca7ef4dea81fe8b96ad77ffc1ade40538e300 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 29 Mar 2013 13:25:12 -0400
Subject: [PATCH] fixed userdata calls

---
 ApiClient.js                           | 16 +++++++++++++---
 dashboard-ui/itemlist.html             |  4 ++--
 dashboard-ui/scripts/Itemdetailpage.js |  4 ++--
 dashboard-ui/scripts/itemlistpage.js   |  3 ---
 dashboard-ui/wizardfinish.html         |  2 +-
 packages.config                        |  2 +-
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ApiClient.js b/ApiClient.js
index 0f014f8703..8380dc8e57 100644
--- a/ApiClient.js
+++ b/ApiClient.js
@@ -213,7 +213,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
          */
         self.getRootFolder = function (userId) {
 
-            return self.getItem(userId);
+            if (!userId) {
+                throw new Error("null userId");
+            }
+
+            var url = self.getUrl("Users/" + userId + "/Items/Root");
+
+            return self.ajax({
+                type: "GET",
+                url: url,
+                dataType: "json"
+            });
         };
 
         /**
@@ -1577,7 +1587,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null itemId");
             }
 
-            var url = "Users/" + userId + "/PlayedItems/" + itemId;
+            var url = self.getUrl("Users/" + userId + "/PlayedItems/" + itemId);
 
             var method = wasPlayed ? "POST" : "DELETE";
 
@@ -1604,7 +1614,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null itemId");
             }
 
-            var url = "Users/" + userId + "/FavoriteItems/" + itemId;
+            var url = self.getUrl("Users/" + userId + "/FavoriteItems/" + itemId);
 
             var method = isFavorite ? "POST" : "DELETE";
 
diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html
index d07db25881..aa637bdc7e 100644
--- a/dashboard-ui/itemlist.html
+++ b/dashboard-ui/itemlist.html
@@ -13,13 +13,13 @@
                 <span id="itemName"></span>
 
                 <div style="display: inline-block; margin-left: 50px;">
-                    <button id="btnSort" type="button" data-icon="sort" data-mini="true" data-inline="true" onclick="$('#sortPanel', $.mobile.activePage).panel( 'toggle' );">Sort</button>
+                    <button id="btnOptions" type="button" data-icon="table" data-mini="true" data-inline="true" onclick="$('#optionsPanel', $.mobile.activePage).panel( 'toggle' );">Change View</button>
                 </div>
             </h1>
 
             <div id="listItems"></div>
 
-            <div data-role="panel" id="sortPanel" data-position="right" data-display="overlay" data-theme="b" data-position-fixed="true">
+            <div data-role="panel" id="optionsPanel" data-position="right" data-display="overlay" data-theme="b" data-position-fixed="true">
 
                 <form>
                     <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index 1fe81667ff..5c24dbf80d 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -731,9 +731,9 @@
         }
 
         if (userData.IsFavorite) {
-            html += '<img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Remove favorite" title="Remove favorite" onclick="ItemDetailPage.setFavorite();" />';
+            html += '<img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Favorite" title="Remove favorite" onclick="ItemDetailPage.setFavorite();" />';
         } else {
-            html += '<img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Mark favorite" title="Mark favorite" onclick="ItemDetailPage.setFavorite();" />';
+            html += '<img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Favorite" title="Mark favorite" onclick="ItemDetailPage.setFavorite();" />';
         }
 
         $('#itemRatings', page).html(html);
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index 397ca06032..78f72aa58a 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -27,13 +27,10 @@
 
     refreshItems: function (query) {
 
-
         var page = $.mobile.activePage;
 
         page.itemQuery = query;
 
-        $('#btnSort', page).html(query.SortBy).button("refresh");
-
         ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(ItemListPage.renderItems);
     },
 
diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html
index 3d51aa0bf9..eafc9e26e8 100644
--- a/dashboard-ui/wizardfinish.html
+++ b/dashboard-ui/wizardfinish.html
@@ -16,7 +16,7 @@
 
                 <div class="wizardNavigation">
                     <button type="button" data-iconpos="left" data-icon="arrow-left" data-inline="true" onclick="history.back();">Previous</button>
-                    <button type="button" data-iconpos="right" data-icon="wrench" data-inline="true" onclick="WizardFinishPage.onFinish();" data-theme="b">Go to the Dashboard</button>
+                    <button type="button" data-iconpos="right" data-icon="dashboard" data-inline="true" onclick="WizardFinishPage.onFinish();" data-theme="b">Go to the Dashboard</button>
                 </div>
             </div>
 
diff --git a/packages.config b/packages.config
index f1726c0728..42d7b089c5 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.68" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.70" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.42" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.42" targetFramework="net45" />
 </packages>
\ No newline at end of file