diff --git a/ApiClient.js b/ApiClient.js
index af785eb3e8..4bdd3f7795 100644
--- a/ApiClient.js
+++ b/ApiClient.js
@@ -20,9 +20,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
if (!serverHostName) {
throw new Error("Must supply serverHostName, e.g. 192.168.1.1 or myServerName");
}
- if (!serverPortNumber) {
- throw new Error("Must supply a serverPortNumber");
- }
var self = this;
var deviceName = "Web Browser";
@@ -38,14 +35,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
return serverHostName;
};
- /**
- * Gets the server port number.
- */
- self.serverPortNumber = function () {
-
- return serverPortNumber;
- };
-
/**
* Gets or sets the current user id.
*/
@@ -152,7 +141,13 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
throw new Error("Url name cannot be empty");
}
- var url = serverProtocol + "//" + serverHostName + ":" + serverPortNumber + "/mediabrowser/" + name;
+ var url = serverProtocol + "//" + serverHostName;
+
+ if (serverPortNumber) {
+ url += ":" + serverPortNumber;
+ }
+
+ url += "/mediabrowser/" + name;
if (params) {
url += "?" + $.param(params);
@@ -3384,7 +3379,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
var deferred = $.Deferred();
- var msgData = itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused) + "|" + (isMuted == null ? "" : isMuted);
+ var msgData = itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused) + "|" + (isMuted == null ? "" : isMuted);
self.sendWebSocketMessage("PlaybackProgress", msgData);
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 41ec6ab387..431666ccd9 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -315,7 +315,7 @@
$('#appVersionNumber', page).html(dashboardInfo.SystemInfo.Version);
- var port = ApiClient.serverPortNumber();
+ var port = dashboardInfo.SystemInfo.HttpServerPortNumber;
if (port == dashboardInfo.SystemInfo.WebSocketPortNumber) {
$('#ports', page).html('Running on port ' + port + '');
diff --git a/packages.config b/packages.config
index 395c46b566..f111dfc5aa 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file