diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js
index 2a52498db1..f9b201b3ee 100644
--- a/dashboard-ui/scripts/chromecast.js
+++ b/dashboard-ui/scripts/chromecast.js
@@ -71,6 +71,8 @@
/* media contents from JSON */
this.mediaContents = null;
+ this.hasReceivers = false;
+
this.initializeCastPlayer();
};
@@ -146,9 +148,13 @@
CastPlayer.prototype.receiverListener = function (e) {
if (e === 'available') {
console.log("receiver found");
+ $('.btnCast').show();
+ this.hasReceivers = true;
}
else {
console.log("receiver list empty");
+ $('.btnCast').hide();
+ this.hasReceivers = false;
}
};
@@ -185,7 +191,7 @@
Dashboard.alert({
title: "Error Launching Chromecast",
- message: "There was an error launching chromecast. Please ensure your device is connected to your wiki network."
+ message: "There was an error launching chromecast. Please ensure your device is connected to your wifi network."
});
};
@@ -211,8 +217,8 @@
this.updateDisplayMessage();
// continue to play media locally
- console.log("current time: " + this.currentMediaTime);
- this.playMediaLocally(this.currentMediaTime);
+ //console.log("current time: " + this.currentMediaTime);
+ //this.playMediaLocally(this.currentMediaTime);
this.updateMediaControlUI();
};
@@ -692,7 +698,10 @@
$('.btnCast').hide();
return;
}
- $('.btnCast').show();
+
+ if (this.hasReceivers) {
+ $('.btnCast').show();
+ }
if (this.deviceState == DEVICE_STATE.ACTIVE) {
$('.btnCast').removeClass('btnDefaultCast').addClass('btnActiveCast');
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index b7cdfc3fb2..f800651580 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -31,6 +31,15 @@
$.when(promise1, promise2, promise3).done(function (response1, response2, response3) {
var item = response1[0];
+
+ currentItem = item;
+
+ if (item.Type == "UserRootFolder") {
+ $('.editPageInnerContent', page).hide();
+ return;
+ } else {
+ $('.editPageInnerContent', page).show();
+ }
var languages = response2[0];
var countries = response3[0];
@@ -53,8 +62,6 @@
$('#refreshLoading', page).hide();
- currentItem = item;
-
if (item.Type != "Channel" &&
item.Type != "Genre" &&
item.Type != "Studio" &&
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index 736c9f8a6c..ffacff403b 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -1,15 +1,28 @@
var LoginPage = {
+ onPageInit: function () {
+
+ var page = this;
+
+ $("#popupLogin", page).popup({
+ afteropen: function (event, ui) {
+ $('#pw').focus();
+ }
+ });
+ },
+
onPageShow: function () {
-
+
Dashboard.showLoadingMsg();
+ var page = this;
+
var isLocalhost = window.location.toString().toLowerCase().indexOf('localhost') != -1;
-
+
if (isLocalhost) {
- $('.localhostMessage', this).show();
+ $('.localhostMessage', page).show();
} else {
- $('.localhostMessage', this).hide();
+ $('.localhostMessage', page).hide();
}
// Show all users on localhost
@@ -29,13 +42,14 @@
if (showManualForm) {
- $('.visualLoginForm', '#loginPage').hide();
- $('#manualLoginForm', '#loginPage').show();
+ $('.visualLoginForm', page).hide();
+ $('#manualLoginForm', page).show();
+ $('#txtManualName', page).focus();
} else {
- $('.visualLoginForm', '#loginPage').show();
- $('#manualLoginForm', '#loginPage').hide();
+ $('.visualLoginForm', page).show();
+ $('#manualLoginForm', page).hide();
LoginPage.loadUserList(users);
}
@@ -189,4 +203,4 @@
}
};
-$(document).on('pageshow', "#loginPage", LoginPage.onPageShow);
+$(document).on('pageshow', "#loginPage", LoginPage.onPageShow).on('pageinit', "#loginPage", LoginPage.onPageInit);
diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
index 80c5253846..82d90d7b15 100644
--- a/dashboard-ui/scripts/metadataimagespage.js
+++ b/dashboard-ui/scripts/metadataimagespage.js
@@ -411,38 +411,7 @@
html += '';
html += '
Rank your preferred local metadata sources in order of priority. The first file found will be read.
';
- var elem = $('.metadataReaders', page).html(html).show().trigger('create');
-
- $(elem).on('click', '.btnLocalReaderMove', function () {
-
- var li = $(this).parents('.localReaderOption');
- var ul = li.parents('ul');
-
- if ($(this).hasClass('btnLocalReaderDown')) {
-
- var next = li.next();
-
- li.remove().insertAfter(next);
-
- } else {
-
- var prev = li.prev();
-
- li.remove().insertBefore(prev);
- }
-
- $('.localReaderOption', ul).each(function () {
-
- if ($(this).prev('.localReaderOption').length) {
- $('.btnLocalReaderMove', this).addClass('btnLocalReaderUp').removeClass('btnLocalReaderDown').attr('data-icon', 'arrow-u').removeClass('ui-icon-arrow-d').addClass('ui-icon-arrow-u');
- } else {
- $('.btnLocalReaderMove', this).addClass('btnLocalReaderDown').removeClass('btnLocalReaderUp').attr('data-icon', 'arrow-d').removeClass('ui-icon-arrow-u').addClass('ui-icon-arrow-d');
- }
-
- });
-
- ul.listview('destroy').listview({});
- });
+ $('.metadataReaders', page).html(html).show().trigger('create');
}
function loadPage(page) {
@@ -611,7 +580,42 @@
return false;
}
- $(document).on('pageshow', "#metadataImagesConfigurationPage", function () {
+ $(document).on('pageinit', "#metadataImagesConfigurationPage", function () {
+
+ var page = this;
+
+ $('.metadataReaders', page).on('click', '.btnLocalReaderMove', function () {
+
+ var li = $(this).parents('.localReaderOption');
+ var ul = li.parents('ul');
+
+ if ($(this).hasClass('btnLocalReaderDown')) {
+
+ var next = li.next();
+
+ li.remove().insertAfter(next);
+
+ } else {
+
+ var prev = li.prev();
+
+ li.remove().insertBefore(prev);
+ }
+
+ $('.localReaderOption', ul).each(function () {
+
+ if ($(this).prev('.localReaderOption').length) {
+ $('.btnLocalReaderMove', this).addClass('btnLocalReaderUp').removeClass('btnLocalReaderDown').attr('data-icon', 'arrow-u').removeClass('ui-icon-arrow-d').addClass('ui-icon-arrow-u');
+ } else {
+ $('.btnLocalReaderMove', this).addClass('btnLocalReaderDown').removeClass('btnLocalReaderUp').attr('data-icon', 'arrow-d').removeClass('ui-icon-arrow-u').addClass('ui-icon-arrow-d');
+ }
+
+ });
+
+ ul.listview('destroy').listview({});
+ });
+
+ }).on('pageshow', "#metadataImagesConfigurationPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 8fa0616503..bab40a53a0 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -11,7 +11,7 @@
SortBy: "DateCreated",
SortOrder: "Descending",
IncludeItemTypes: "Movie",
- Limit: screenWidth >= 1440 ? 21 : 12,
+ Limit: screenWidth >= 1920 ? 21 : (screenWidth >= 1440 ? 16 : 12),
Recursive: true,
Fields: "PrimaryImageAspectRatio,DateCreated,UserData",
Filters: "IsUnplayed"
@@ -57,13 +57,12 @@
});
-
options = {
SortBy: "DateCreated",
SortOrder: "Descending",
IncludeItemTypes: "Trailer",
- Limit: screenWidth >= 1440 ? 7 : 6,
+ Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 8 : 6),
Recursive: true,
Fields: "PrimaryImageAspectRatio,DateCreated,UserData",
Filters: "IsUnplayed"
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 6530bd78ad..8de70382df 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -192,36 +192,9 @@ var Dashboard = {
}
}
- if (isFirstLoad) {
- Dashboard.showFailedAssemblies(info.FailedPluginAssemblies);
- }
-
Dashboard.showInProgressInstallations(info.InProgressInstallations);
},
- showFailedAssemblies: function (failedAssemblies) {
-
- for (var i = 0, length = failedAssemblies.length; i < length; i++) {
-
- var assembly = failedAssemblies[i];
-
- var html = '

';
-
- var index = assembly.lastIndexOf('\\');
-
- if (index != -1) {
- assembly = assembly.substring(index + 1);
- }
-
- html += '
';
- html += assembly + " failed to load.";
- html += '';
-
- Dashboard.showFooterNotification({ html: html });
-
- }
- },
-
showInProgressInstallations: function (installations) {
installations = installations || [];