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

switch to unified notifications

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-22 13:30:39 -04:00
parent fa438393af
commit cec6b66c27
19 changed files with 200 additions and 514 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,16 +2,16 @@
function login(page, username, password) {
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
ConnectionManager.loginToConnect(username, password).then(function () {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
Dashboard.navigate('selectserver.html');
}, function () {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
Dashboard.alert({
message: Globalize.translate('MessageInvalidUser'),
@ -26,7 +26,7 @@
function handleConnectionResult(page, result) {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
switch (result.State) {
@ -75,7 +75,7 @@
function loadAppConnection(page) {
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
ConnectionManager.connect().then(function (result) {
@ -167,7 +167,7 @@
host += ':' + port;
}
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
ConnectionManager.connectToAddress(host).then(function (result) {

4
dashboard-ui/scripts/indexpage.js
View file

@ -68,10 +68,10 @@
return Sections.loadLibraryTiles(elem, user, 'backdrop', index, false, showLibraryTileNames);
}
else if (section == 'smalllibrarytiles') {
return Sections.loadLibraryTiles(elem, user, 'homePageSmallBackdrop', index, false, showLibraryTileNames);
return Sections.loadLibraryTiles(elem, user, 'smallBackdrop', index, false, showLibraryTileNames);
}
else if (section == 'smalllibrarytiles-automobile') {
return Sections.loadLibraryTiles(elem, user, 'homePageSmallBackdrop', index, true, showLibraryTileNames);
return Sections.loadLibraryTiles(elem, user, 'smallBackdrop', index, true, showLibraryTileNames);
}
else if (section == 'librarytiles-automobile') {
return Sections.loadLibraryTiles(elem, user, 'backdrop', index, true, showLibraryTileNames);

14
dashboard-ui/scripts/librarybrowser.js
View file

@ -835,7 +835,7 @@
return html;
},
shapes: ['square', 'portrait', 'banner', 'smallBackdrop', 'homePageSmallBackdrop', 'backdrop', 'overflowBackdrop', 'overflowPortrait', 'overflowSquare'],
shapes: ['square', 'portrait', 'banner', 'smallBackdrop', 'backdrop', 'overflowBackdrop', 'overflowPortrait', 'overflowSquare'],
getPostersPerRow: function (screenWidth) {
@ -881,14 +881,6 @@
if (screenWidth >= 540) return 3;
if (screenWidth >= 420) return 2;
return 1;
case 'homePageSmallBackdrop':
if (screenWidth >= 1440) return 8;
if (screenWidth >= 1100) return 6;
if (screenWidth >= 800) return 5;
if (screenWidth >= 600) return 4;
if (screenWidth >= 540) return 3;
if (screenWidth >= 420) return 2;
return 1;
case 'overflowPortrait':
if (screenWidth >= 1000) return 100 / 23;
if (screenWidth >= 640) return 100 / 36;
@ -1015,10 +1007,6 @@
else if (options.shape == 'smallBackdrop') {
thumbWidth = posterInfo.smallBackdropWidth;
}
else if (options.shape == 'homePageSmallBackdrop') {
thumbWidth = posterInfo.homePageSmallBackdropWidth;
posterWidth = posterInfo.homePageSmallBackdropWidth;
}
else if (options.shape == 'detailPagePortrait') {
posterWidth = 200;
}

54
dashboard-ui/scripts/librarymenu.js
View file

@ -14,7 +14,7 @@
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonLeft headerBackButton hide autoSize"><i class="md-icon">' + backIcon + '</i></button>';
html += '<button type="button" is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft autoSize"><i class="md-icon">menu</i></button>';
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerAppsButton barsMenuButton headerButtonLeft autoSize"><i class="md-icon">menu</i></button>';
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerAppsButton barsMenuButton headerButtonLeft autoSize"><i class="md-icon">home</i></button>';
html += '<div class="libraryMenuButtonText headerButton">' + Globalize.translate('ButtonHome') + '</div>';
@ -179,57 +179,7 @@
function onHeaderAppsButtonClick() {
require(['dialogHelper', 'dom'], function (dialogHelper, dom) {
var dlg = dialogHelper.createDialog({
removeOnClose: true,
modal: false,
autoFocus: false,
entryAnimationDuration: 160,
exitAnimationDuration: 160,
enableHistory: false
});
dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a');
dlg.classList.add('adminAppsMenu');
var html = '';
html += '<div class="adminAppsMenuRow">';
html += '<a class="adminAppsButton" href="home.html">';
html += '<button is="paper-icon-button-light" class="autoSize"><i class="md-icon">home</i></button>';
html += '<div>' + Globalize.translate('ButtonHome') + '</div>';
html += '</a>';
html += '</div>';
html += '<div class="adminAppsMenuRow">';
html += '<a class="adminAppsButton" href="edititemmetadata.html">';
html += '<button is="paper-icon-button-light" class="autoSize"><i class="md-icon">mode_edit</i></button>';
html += '<div>' + Globalize.translate('ButtonMetadataManager') + '</div>';
html += '</a>';
html += '<a class="adminAppsButton" href="reports.html">';
html += '<button is="paper-icon-button-light" class="autoSize"><i class="md-icon">insert_chart</i></button>';
html += '<div>' + Globalize.translate('ButtonReports') + '</div>';
html += '</a>';
html += '</div>';
dlg.innerHTML = html;
document.body.appendChild(dlg);
dlg.addEventListener('click', function (e) {
var link = dom.parentWithTag(e.target, 'A');
if (link) {
dialogHelper.close(dlg);
}
});
dialogHelper.open(dlg);
});
Dashboard.navigate('home.html');
}
function bindMenuEvents() {

55
dashboard-ui/scripts/mediacontroller.js
View file

@ -801,10 +801,7 @@
break;
default:
{
if (player.isLocalPlayer) {
// Not player-related
Dashboard.processGeneralCommand(cmd);
} else {
if (!player.isLocalPlayer) {
player.sendCommand(cmd);
}
break;
@ -1070,60 +1067,12 @@
function onWebSocketMessageReceived(e, msg) {
var localPlayer;
if (msg.MessageType === "Play") {
localPlayer = MediaController.getLocalPlayer();
if (msg.Data.PlayCommand == "PlayNext") {
localPlayer.queueNext({ ids: msg.Data.ItemIds });
}
else if (msg.Data.PlayCommand == "PlayLast") {
localPlayer.queue({ ids: msg.Data.ItemIds });
}
else {
localPlayer.play({ ids: msg.Data.ItemIds, startPositionTicks: msg.Data.StartPositionTicks });
}
}
else if (msg.MessageType === "ServerShuttingDown") {
if (msg.MessageType === "ServerShuttingDown") {
MediaController.setDefaultPlayerActive();
}
else if (msg.MessageType === "ServerRestarting") {
MediaController.setDefaultPlayerActive();
}
else if (msg.MessageType === "Playstate") {
localPlayer = MediaController.getLocalPlayer();
if (msg.Data.Command === 'Stop') {
localPlayer.stop();
}
else if (msg.Data.Command === 'Pause') {
localPlayer.pause();
}
else if (msg.Data.Command === 'Unpause') {
localPlayer.unpause();
}
else if (msg.Data.Command === 'Seek') {
localPlayer.seek(msg.Data.SeekPositionTicks);
}
else if (msg.Data.Command === 'NextTrack') {
localPlayer.nextTrack();
}
else if (msg.Data.Command === 'PreviousTrack') {
localPlayer.previousTrack();
}
}
else if (msg.MessageType === "GeneralCommand") {
var cmd = msg.Data;
localPlayer = MediaController.getLocalPlayer();
MediaController.sendCommand(cmd, localPlayer);
}
}
function initializeApiClient(apiClient) {

10
dashboard-ui/scripts/mediaplayer.js
View file

@ -783,10 +783,14 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
return null;
};
self.displayContent = function (options) {
self.displayContent = function (cmd) {
// Handle it the same as a remote control command
Dashboard.onBrowseCommand(options);
var apiClient = ApiClient;
apiClient.getItem(apiClient.getCurrentUserId(), cmd.ItemId).then(function (item) {
require(['embyRouter'], function (embyRouter) {
embyRouter.showItem(item);
});
});
};
self.getItemsForPlayback = function (query) {

4
dashboard-ui/scripts/moviecollections.js
View file

@ -118,7 +118,7 @@
html = libraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
shape: "auto",
context: 'movies',
showTitle: true,
showYear: true,
@ -132,7 +132,7 @@
// Poster
html = libraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
shape: "auto",
context: 'movies',
centerText: true,
lazy: true,

4
dashboard-ui/scripts/moviesrecommended.js
View file

@ -260,9 +260,7 @@
loadResume(tabContent, userId, parentId);
loadLatest(tabContent, userId, parentId);
if (AppInfo.enableMovieHomeSuggestions) {
loadSuggestions(tabContent, userId, parentId);
}
loadSuggestions(tabContent, userId, parentId);
}
return function (view, params) {

14
dashboard-ui/scripts/selectserver.js
View file

@ -71,7 +71,7 @@
function showGeneralError() {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
Dashboard.alert({
message: Globalize.translate('DefaultErrorMessage')
});
@ -138,12 +138,12 @@
function acceptInvitation(page, id) {
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
// Add/Update connect info
ConnectionManager.acceptServer(id).then(function () {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
loadPage(page);
}, function () {
@ -154,12 +154,12 @@
function deleteServer(page, serverId) {
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
// Add/Update connect info
ConnectionManager.deleteServer(serverId).then(function () {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
loadPage(page);
@ -172,12 +172,12 @@
function rejectInvitation(page, id) {
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
// Add/Update connect info
ConnectionManager.rejectServer(id).then(function () {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
loadPage(page);

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

@ -1,18 +1,4 @@
(function () {
function onOneDocumentClick() {
document.removeEventListener('click', onOneDocumentClick);
if (window.Notification) {
Notification.requestPermission();
}
}
document.addEventListener('click', onOneDocumentClick);
})();
var Dashboard = {
var Dashboard = {
isConnectMode: function () {
@ -72,20 +58,6 @@ var Dashboard = {
}
},
onPopupOpen: function () {
Dashboard.popupCount = (Dashboard.popupCount || 0) + 1;
document.body.classList.add('bodyWithPopupOpen');
},
onPopupClose: function () {
Dashboard.popupCount = (Dashboard.popupCount || 1) - 1;
if (!Dashboard.popupCount) {
document.body.classList.remove('bodyWithPopupOpen');
}
},
getCurrentUser: function () {
return window.ApiClient.getCurrentUser();
@ -415,32 +387,6 @@ var Dashboard = {
});
},
getModalLoadingMsg: function () {
var elem = document.querySelector('.modalLoading');
if (!elem) {
elem = document.createElement('modalLoading');
elem.classList.add('modalLoading');
elem.classList.add('hide');
document.body.appendChild(elem);
}
return elem;
},
showModalLoadingMsg: function () {
Dashboard.getModalLoadingMsg().classList.remove('hide');
Dashboard.showLoadingMsg();
},
hideModalLoadingMsg: function () {
Dashboard.getModalLoadingMsg().classList.add('hide');
Dashboard.hideLoadingMsg();
},
processPluginConfigurationUpdateResult: function () {
Dashboard.hideLoadingMsg();
@ -784,12 +730,22 @@ var Dashboard = {
name: Globalize.translate('TabLogs'),
href: "log.html",
pageIds: ['logPage'],
icon: 'folder-open'
icon: 'folder_open'
}, {
name: Globalize.translate('TabScheduledTasks'),
href: "scheduledtasks.html",
pageIds: ['scheduledTasksPage', 'scheduledTaskPage'],
icon: 'schedule'
}, {
name: Globalize.translate('ButtonMetadataManager'),
href: "edititemmetadata.html",
pageIds: [],
icon: 'mode_edit'
}, {
name: Globalize.translate('ButtonReports'),
href: "reports.html",
pageIds: [],
icon: 'insert_chart'
}, {
name: Globalize.translate('TabHelp'),
href: "about.html",
@ -801,87 +757,11 @@ var Dashboard = {
},
processGeneralCommand: function (cmd) {
// Full list
// https://github.com/MediaBrowser/MediaBrowser/blob/master/MediaBrowser.Model/Session/GeneralCommand.cs#L23
switch (cmd.Name) {
case 'GoHome':
Dashboard.navigate('home.html');
break;
case 'GoToSettings':
Dashboard.navigate('dashboard.html');
break;
case 'DisplayContent':
Dashboard.onBrowseCommand(cmd.Arguments);
break;
case 'GoToSearch':
Dashboard.navigate('search.html');
break;
case 'DisplayMessage':
{
var args = cmd.Arguments;
if (args.TimeoutMs && window.Notification && Notification.permission === "granted") {
var notification = {
title: args.Header,
body: args.Text,
vibrate: true,
timeout: args.TimeoutMs
};
var notif = new Notification(notification.title, notification);
if (notif.show) {
notif.show();
}
if (notification.timeout) {
setTimeout(function () {
if (notif.close) {
notif.close();
}
else if (notif.cancel) {
notif.cancel();
}
}, notification.timeout);
}
}
else {
Dashboard.alert({ title: args.Header, message: args.Text });
}
break;
}
case 'VolumeUp':
case 'VolumeDown':
case 'Mute':
case 'Unmute':
case 'ToggleMute':
case 'SetVolume':
case 'SetAudioStreamIndex':
case 'SetSubtitleStreamIndex':
case 'ToggleFullscreen':
case 'SetRepeatMode':
break;
default:
console.log('Unrecognized command: ' + cmd.Name);
break;
}
},
onWebSocketMessageReceived: function (e, data) {
var msg = data;
if (msg.MessageType === "LibraryChanged") {
Dashboard.processLibraryUpdateNotification(msg.Data);
}
else if (msg.MessageType === "ServerShuttingDown") {
if (msg.MessageType === "ServerShuttingDown") {
Dashboard.hideServerRestartWarning();
}
else if (msg.MessageType === "ServerRestarting") {
@ -929,50 +809,6 @@ var Dashboard = {
}
});
}
else if (msg.MessageType === "GeneralCommand") {
var cmd = msg.Data;
// Media Controller should catch this
//Dashboard.processGeneralCommand(cmd);
}
},
onBrowseCommand: function (cmd) {
var url;
var type = (cmd.ItemType || "").toLowerCase();
if (type == "genre") {
url = "itemdetails.html?id=" + cmd.ItemId;
}
else if (type == "musicgenre") {
url = "itemdetails.html?id=" + cmd.ItemId;
}
else if (type == "gamegenre") {
url = "itemdetails.html?id=" + cmd.ItemId;
}
else if (type == "studio") {
url = "itemdetails.html?id=" + cmd.ItemId;
}
else if (type == "person") {
url = "itemdetails.html?id=" + cmd.ItemId;
}
else if (type == "musicartist") {
url = "itemdetails.html?id=" + cmd.ItemId;
}
if (url) {
Dashboard.navigate(url);
return;
}
ApiClient.getItem(Dashboard.getCurrentUserId(), cmd.ItemId).then(function (item) {
Dashboard.navigate(LibraryBrowser.getHref(item, null, ''));
});
},
showPackageInstallNotification: function (installation, status) {
@ -1038,77 +874,6 @@ var Dashboard = {
Dashboard.showFooterNotification({ html: html, id: installation.Id, timeout: timeout, forceShow: forceShow, allowHide: allowHide });
},
processLibraryUpdateNotification: function (data) {
var newItems = data.ItemsAdded;
if (!newItems.length || AppInfo.isNativeApp || !window.Notification || Notification.permission !== "granted") {
return;
}
ApiClient.getItems(Dashboard.getCurrentUserId(), {
Recursive: true,
Limit: 3,
Filters: "IsNotFolder",
SortBy: "DateCreated",
SortOrder: "Descending",
ImageTypes: "Primary",
Ids: newItems.join(',')
}).then(function (result) {
var items = result.Items;
for (var i = 0, length = Math.min(items.length, 2) ; i < length; i++) {
var item = items[i];
var notification = {
title: "New " + item.Type,
body: item.Name,
timeout: 15000,
vibrate: true,
data: {
options: {
url: LibraryBrowser.getHref(item)
}
}
};
var imageTags = item.ImageTags || {};
if (imageTags.Primary) {
notification.icon = ApiClient.getScaledImageUrl(item.Id, {
width: 60,
tag: imageTags.Primary,
type: "Primary"
});
}
var notif = new Notification(notification.title, notification);
if (notif.show) {
notif.show();
}
if (notification.timeout) {
setTimeout(function () {
if (notif.close) {
notif.close();
}
else if (notif.cancel) {
notif.cancel();
}
}, notification.timeout);
}
}
});
},
setPageTitle: function (title, documentTitle) {
LibraryMenu.setTitle(title || 'Emby');
@ -1466,8 +1231,6 @@ var AppInfo = {};
var isCordova = Dashboard.isRunningInCordova();
AppInfo.enableDetailPageChapters = true;
AppInfo.enableDetailsMenuImages = true;
AppInfo.enableMovieHomeSuggestions = true;
AppInfo.enableSearchInTopMenu = true;
AppInfo.enableHomeFavorites = true;
AppInfo.enableNowPlayingBar = true;
@ -1500,8 +1263,6 @@ var AppInfo = {};
} else {
AppInfo.enableDetailPageChapters = false;
AppInfo.enableDetailsMenuImages = false;
AppInfo.enableMovieHomeSuggestions = false;
}
}
@ -3258,6 +3019,12 @@ var AppInfo = {};
postInitDependencies.push('robotoFont');
}
postInitDependencies.push('bower_components/emby-webcomponents/input/api');
if (window.Notification && !AppInfo.isNativeApp) {
postInitDependencies.push('bower_components/emby-webcomponents/librarychangednotifications');
}
require(postInitDependencies);
upgradeLayouts();
});