mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update hdhr stream

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-12 13:37:58 -04:00
parent d1f8d6afc2
commit d808aced1d
5 changed files with 61 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.2.19", "version": "1.2.21",
"_release": "1.2.19", "_release": "1.2.21",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.2.19", "tag": "1.2.21",
"commit": "31e70d0eb2beebfcff7817b4e91177fbc16962b5" "commit": "562008a40ddd38451acd2eaee618541fbf3472d3"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

10
dashboard-ui/bower_components/emby-webcomponents/input/api.js vendored
View file

@ -127,9 +127,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
var apiClient = this; var apiClient = this;
if (msg.MessageType === "LibraryChanged") { if (msg.MessageType === "Play") {
}
else if (msg.MessageType === "Play") {
var serverId = apiClient.serverInfo().Id; var serverId = apiClient.serverInfo().Id;
@ -143,10 +141,6 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
playbackManager.play({ ids: msg.Data.ItemIds, startPositionTicks: msg.Data.StartPositionTicks, serverId: serverId }); playbackManager.play({ ids: msg.Data.ItemIds, startPositionTicks: msg.Data.StartPositionTicks, serverId: serverId });
} }
} }
else if (msg.MessageType === "ServerShuttingDown") {
}
else if (msg.MessageType === "ServerRestarting") {
}
else if (msg.MessageType === "Playstate") { else if (msg.MessageType === "Playstate") {
if (msg.Data.Command === 'Stop') { if (msg.Data.Command === 'Stop') {
@ -172,8 +166,6 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
var cmd = msg.Data; var cmd = msg.Data;
processGeneralCommand(cmd); processGeneralCommand(cmd);
} }
else if (msg.MessageType === "RestartRequired") {
}
} }
function bindEvents(apiClient) { function bindEvents(apiClient) {

48
dashboard-ui/bower_components/emby-webcomponents/servernotifications.js vendored Normal file
View file

@ -0,0 +1,48 @@
define(['connectionManager', 'events'], function (connectionManager, events) {
var serverNotifications = {};
function onWebSocketMessageReceived(e, msg) {
var apiClient = this;
if (msg.MessageType === "LibraryChanged") {
}
else if (msg.MessageType === "ServerShuttingDown") {
events.trigger(serverNotifications, 'ServerShuttingDown', [apiClient]);
}
else if (msg.MessageType === "ServerRestarting") {
events.trigger(serverNotifications, 'ServerRestarting', [apiClient]);
}
else if (msg.MessageType === "RestartRequired") {
events.trigger(serverNotifications, 'RestartRequired', [apiClient]);
}
else if (msg.MessageType === "UserDataChanged") {
if (msg.Data.UserId == apiClient.getCurrentUserId()) {
for (var i = 0, length = msg.Data.UserDataList.length; i < length; i++) {
events.trigger(serverNotifications, 'UserDataChanged', [apiClient, msg.Data.UserDataList[i]]);
}
}
}
}
function bindEvents(apiClient) {
events.off(apiClient, "websocketmessage", onWebSocketMessageReceived);
events.on(apiClient, "websocketmessage", onWebSocketMessageReceived);
}
//var current = connectionManager.currentApiClient();
//if (current) {
// bindEvents(current);
//}
events.on(connectionManager, 'apiclientcreated', function (e, newApiClient) {
bindEvents(newApiClient);
});
return serverNotifications;
});

6
dashboard-ui/bower_components/iron-behaviors/.bower.json vendored
View file

@ -29,14 +29,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-behaviors", "homepage": "https://github.com/PolymerElements/iron-behaviors",
"_release": "1.0.13", "_release": "1.0.13",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.13", "tag": "v1.0.13",
"commit": "a7bc3428a6da2beed21987b3a8028206826a12bc" "commit": "a7bc3428a6da2beed21987b3a8028206826a12bc"
}, },
"_source": "git://github.com/polymerelements/iron-behaviors.git", "_source": "git://github.com/PolymerElements/iron-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-behaviors" "_originalSource": "PolymerElements/iron-behaviors"
} }

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

@ -832,6 +832,11 @@ var Dashboard = {
icon: 'add-shopping-cart' icon: 'add-shopping-cart'
} }
] ]
}, {
name: Globalize.translate('TabNotifications'),
icon: 'notifications',
color: 'brown',
href: "notificationsettings.html"
}, { }, {
name: Globalize.translate('TabPlayback'), name: Globalize.translate('TabPlayback'),
icon: 'play-circle-filled', icon: 'play-circle-filled',
@ -921,11 +926,6 @@ var Dashboard = {
href: "dashboardhosting.html", href: "dashboardhosting.html",
pageIds: ['dashboardHostingPage'], pageIds: ['dashboardHostingPage'],
icon: 'wifi' icon: 'wifi'
}, {
name: Globalize.translate('TabNotifications'),
href: "notificationsettings.html",
pageIds: ['notificationSettingsPage', 'notificationSettingPage'],
icon: 'notifications'
}, { }, {
name: Globalize.translate('TabScheduledTasks'), name: Globalize.translate('TabScheduledTasks'),
href: "scheduledtasks.html", href: "scheduledtasks.html",