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

update components

This commit is contained in:
Luke Pulverenti 2016-07-31 14:39:43 -04:00
parent 862871630a
commit c5ccae28b5
4 changed files with 48 additions and 27 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.139",
"_release": "1.4.139",
"version": "1.4.140",
"_release": "1.4.140",
"_resolution": {
"type": "version",
"tag": "1.4.139",
"commit": "018e5ac964a1ebe99ac21391c9d4a27a47f469e0"
"tag": "1.4.140",
"commit": "e772e866601556c902fd312a893653706a5ba13a"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

View file

@ -1,5 +1,10 @@
define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focusManager', 'embyRouter'], function (connectionManager, playbackManager, events, inputManager, focusManager, embyRouter) {
function notifyApp() {
inputManager.notify();
}
function displayMessage(cmd) {
var args = cmd.Arguments;
@ -35,76 +40,79 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
case 'Select':
inputManager.trigger('select');
break;
return;
case 'Back':
inputManager.trigger('back');
break;
return;
case 'MoveUp':
inputManager.trigger('up');
break;
return;
case 'MoveDown':
inputManager.trigger('down');
break;
return;
case 'MoveLeft':
inputManager.trigger('left');
break;
return;
case 'MoveRight':
inputManager.trigger('right');
break;
return;
case 'PageUp':
inputManager.trigger('pageup');
break;
return;
case 'PageDown':
inputManager.trigger('pagedown');
break;
return;
case 'SetRepeatMode':
playbackManager.setRepeatMode(cmd.Arguments.RepeatMode);
break;
case 'VolumeUp':
inputManager.trigger('volumeup');
break;
return;
case 'VolumeDown':
inputManager.trigger('volumedown');
break;
return;
case 'ChannelUp':
inputManager.trigger('channelup');
break;
return;
case 'ChannelDown':
inputManager.trigger('channeldown');
break;
return;
case 'Mute':
inputManager.trigger('mute');
break;
return;
case 'Unmute':
inputManager.trigger('unmute');
break;
return;
case 'ToggleMute':
inputManager.trigger('togglemute');
break;
return;
case 'SetVolume':
notifyApp();
playbackManager.volume(cmd.Arguments.Volume);
break;
case 'SetAudioStreamIndex':
notifyApp();
playbackManager.setAudioStreamIndex(parseInt(cmd.Arguments.Index));
break;
case 'SetSubtitleStreamIndex':
notifyApp();
playbackManager.setSubtitleStreamIndex(parseInt(cmd.Arguments.Index));
break;
case 'ToggleFullscreen':
inputManager.trigger('togglefullscreen');
break;
return;
case 'GoHome':
inputManager.trigger('home');
break;
return;
case 'GoToSettings':
inputManager.trigger('settings');
break;
return;
case 'DisplayContent':
displayContent(cmd, apiClient);
break;
case 'GoToSearch':
inputManager.trigger('search');
break;
return;
case 'DisplayMessage':
displayMessage(cmd);
break;
@ -128,6 +136,8 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
console.log('processGeneralCommand does not recognize: ' + cmd.Name);
break;
}
notifyApp();
}
function onWebSocketMessageReceived(e, msg) {
@ -136,6 +146,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
if (msg.MessageType === "Play") {
notifyApp();
var serverId = apiClient.serverInfo().Id;
if (msg.Data.PlayCommand == "PlayNext") {
@ -147,6 +158,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
else {
playbackManager.play({ ids: msg.Data.ItemIds, startPositionTicks: msg.Data.StartPositionTicks, serverId: serverId });
}
}
else if (msg.MessageType === "Playstate") {
@ -167,6 +179,8 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
}
else if (msg.Data.Command === 'PreviousTrack') {
inputManager.trigger('previous');
} else {
notifyApp();
}
}
else if (msg.MessageType === "GeneralCommand") {

View file

@ -4,6 +4,12 @@ define(['playbackManager', 'focusManager', 'embyRouter'], function (playbackMana
function notify() {
lastInputTime = new Date().getTime();
handleCommand('unknown');
}
function notifyMouseMove() {
lastInputTime = new Date().getTime();
}
function idleTime() {
@ -47,7 +53,7 @@ define(['playbackManager', 'focusManager', 'embyRouter'], function (playbackMana
function handleCommand(name, options) {
notify();
lastInputTime = new Date().getTime();
var sourceElement = (options ? options.sourceElement : null);
@ -231,6 +237,7 @@ define(['playbackManager', 'focusManager', 'embyRouter'], function (playbackMana
trigger: handleCommand,
handle: handleCommand,
notify: notify,
notifyMouseMove: notifyMouseMove,
idleTime: idleTime,
on: on,
off: off

View file

@ -31,14 +31,14 @@
"web-component-tester": "*"
},
"private": true,
"homepage": "https://github.com/polymer/polymer",
"homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.0",
"_resolution": {
"type": "version",
"tag": "v1.6.0",
"commit": "8715c83bf04a228de00ec662ed43eb6141e61b91"
},
"_source": "git://github.com/polymer/polymer.git",
"_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0",
"_originalSource": "polymer/polymer"
"_originalSource": "Polymer/polymer"
}