aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-03-21 16:43:42 -0400
committerLukePulverenti <luke.pulverenti@gmail.com>2013-03-21 16:43:42 -0400
commit4bc27f3a65ddbffcc7b74683df72503f20df275c (patch)
treebcd807622e3df6a21bd5a4691b425eabb8e632cf
parentdb20e9e3ea297c2d4bcb9646b422fb80139186de (diff)
update to latest js apiclient
-rw-r--r--MediaBrowser.WebDashboard/ApiClient.js5
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/LoginPage.js2
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/UserProfilesPage.js2
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/WizardStartPage.js2
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/WizardUserPage.js4
-rw-r--r--MediaBrowser.WebDashboard/packages.config2
6 files changed, 10 insertions, 7 deletions
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index a9aeedab7..f3b24cd29 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -46,6 +46,9 @@ MediaBrowser.ApiClient = function ($, navigator) {
}
};
+ /**
+ * Wraps around jQuery ajax methods to add additional info to the request.
+ */
self.ajax = function (request) {
if (!request) {
@@ -834,7 +837,7 @@ MediaBrowser.ApiClient = function ($, navigator) {
/**
* Gets all users from the server
*/
- self.getAllUsers = function () {
+ self.getUsers = function () {
var url = self.getUrl("users");
diff --git a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
index ac4570f08..5c17b90cb 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
@@ -3,7 +3,7 @@
onPageShow: function () {
Dashboard.showLoadingMsg();
- ApiClient.getAllUsers().done(LoginPage.loadUserList);
+ ApiClient.getUsers().done(LoginPage.loadUserList);
},
getLastSeenText: function (lastActivityDate) {
diff --git a/MediaBrowser.WebDashboard/Html/scripts/UserProfilesPage.js b/MediaBrowser.WebDashboard/Html/scripts/UserProfilesPage.js
index b36962a5c..b6fe09716 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/UserProfilesPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/UserProfilesPage.js
@@ -7,7 +7,7 @@
loadPageData: function () {
Dashboard.showLoadingMsg();
- ApiClient.getAllUsers().done(UserProfilesPage.renderUsers);
+ ApiClient.getUsers().done(UserProfilesPage.renderUsers);
},
renderUsers: function (users) {
diff --git a/MediaBrowser.WebDashboard/Html/scripts/WizardStartPage.js b/MediaBrowser.WebDashboard/Html/scripts/WizardStartPage.js
index 97c09d2ab..4d3dbfd19 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/WizardStartPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/WizardStartPage.js
@@ -2,7 +2,7 @@
gotoNextPage: function () {
- ApiClient.getAllUsers().done(function (users) {
+ ApiClient.getUsers().done(function (users) {
if (users.length > 1) {
diff --git a/MediaBrowser.WebDashboard/Html/scripts/WizardUserPage.js b/MediaBrowser.WebDashboard/Html/scripts/WizardUserPage.js
index decc6c3a3..a01654ae1 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/WizardUserPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/WizardUserPage.js
@@ -6,7 +6,7 @@
var page = this;
- ApiClient.getAllUsers().done(function (users) {
+ ApiClient.getUsers().done(function (users) {
var user = users[0] || { Name: "User" };
@@ -23,7 +23,7 @@
var page = $.mobile.activePage;
- ApiClient.getAllUsers().done(function (users) {
+ ApiClient.getUsers().done(function (users) {
var user;
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index e7c11afa0..e2d5512a7 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="MediaBrowser.ApiClient.Javascript" version="3.0.49" targetFramework="net45" />
+ <package id="MediaBrowser.ApiClient.Javascript" version="3.0.50" targetFramework="net45" />
<package id="ServiceStack" version="3.9.40" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.40" targetFramework="net45" />
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.41" targetFramework="net45" />