milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improve compatibility view error message

Browse source
This commit is contained in:
Luke Pulverenti 2013-10-18 15:47:57 -04:00
parent 707f6ab48b
commit 7e34533cae
8 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/scripts/extensions.js
View file

@ -9,15 +9,6 @@
return true;
}
if (!window.WebSocket) {
alert("This browser does not support web sockets. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
}
if (!IsStorageEnabled()) {
alert("This browser does not support local storage or is running in private mode. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
}
// Array Remove - By John Resig (MIT Licensed)
Array.prototype.remove = function (from, to) {
var rest = this.slice((to || from) + 1 || this.length);

26
dashboard-ui/scripts/medialibrarypage.js
View file

@ -204,11 +204,13 @@
if (showCollectionType) {
$('#fldCollectionType', popup).show();
$('#selectCollectionType', popup).attr('required', 'required').selectmenu('refresh');
} else {
$('#fldCollectionType', popup).hide();
$('#selectCollectionType', popup).removeAttr('required').selectmenu('refresh');
}
$('#selectCollectionType', popup).html(MediaLibraryPage.getCollectionTypeOptionsHtml()).selectmenu('refresh');
$('#selectCollectionType', popup).html(MediaLibraryPage.getCollectionTypeOptionsHtml()).val('').selectmenu('refresh');
popup.on("popupafteropen", function () {
$('#textEntryForm input:first', this).focus();
@ -222,7 +224,15 @@
if (callback) {
if (showCollectionType) {
callback($('#txtValue', popup).val(), $('#selectCollectionType', popup).val());
var collectionType = $('#selectCollectionType', popup).val();
// The server expects an empty value for mixed
if (collectionType == 'mixed') {
collectionType = '';
}
callback($('#txtValue', popup).val(), collectionType);
} else {
callback($('#txtValue', popup).val());
}
@ -246,19 +256,19 @@
return [
{ name: "General or mixed content", value: "" },
{ name: "Adult videos", value: "adultvideos" },
{ name: "", value: "" },
{ name: "Movies", value: "movies" },
{ name: "Music", value: "music" },
{ name: "TV shows", value: "tvshows" },
{ name: "Books*", value: "books" },
{ name: "Box sets", value: "boxsets" },
{ name: "Games*", value: "games" },
{ name: "Home videos", value: "homevideos" },
{ name: "Movies", value: "movies" },
{ name: "Music", value: "music" },
{ name: "Music videos", value: "musicvideos" },
{ name: "Photos*", value: "photos" },
{ name: "Trailers", value: "trailers" },
{ name: "TV shows", value: "tvshows" }
{ name: "Adult videos", value: "adultvideos" },
{ name: "General or mixed content", value: "mixed" }
];
},

12
dashboard-ui/scripts/site.js
View file

@ -1113,10 +1113,18 @@ var Dashboard = {
return parts.join(':');
}
};
if (!window.WebSocket) {
alert("This browser does not support web sockets. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
}
if (!IsStorageEnabled()) {
alert("This browser does not support local storage or is running in private mode. For a better experience, try a newer browser such as Chrome (android, desktop), Firefox, IE10, Safari (iOS) or Opera.");
}
var ApiClient = MediaBrowser.ApiClient.create("Dashboard", window.dashboardVersion);
$(ApiClient).on("websocketmessage", Dashboard.onWebSocketMessageReceived);