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

fix theme songs getting sent to remote player

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-26 13:48:20 -04:00
parent c32aa0dab1
commit 68b6ae9083
7 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.1.76", "version": "1.1.77",
"_release": "1.1.76", "_release": "1.1.77",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.76", "tag": "1.1.77",
"commit": "1096ffc66e3df8d63e305889dd7fb5b769095082" "commit": "685285e67f67ba356af1be84652e9705a6ea7b74"
}, },
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51", "_target": "^1.1.51",

2
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

@ -215,7 +215,7 @@
return connectUser; return connectUser;
}; };
var minServerVersion = '3.0.5971'; var minServerVersion = '3.0.5972';
self.minServerVersion = function (val) { self.minServerVersion = function (val) {
if (val) { if (val) {

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

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.188", "version": "1.4.189",
"_release": "1.4.188", "_release": "1.4.189",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.188", "tag": "1.4.189",
"commit": "9bfd0321b48bbe058008848619521d3d5b23bbe7" "commit": "d7b1da1cd548e50125dd5419b3742fdfc9a07460"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

3
dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js vendored
View file

@ -22,7 +22,8 @@ define(['playbackManager', 'browser'], function (playbackManager, browser) {
if (enabled(items[0].MediaType)) { if (enabled(items[0].MediaType)) {
playbackManager.play({ playbackManager.play({
items: items, items: items,
fullscreen: false fullscreen: false,
enableRemotePlayers: false
}); });
} }

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

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-icon", "homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.10", "_release": "1.0.10",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.10", "tag": "v1.0.10",
"commit": "f4e146da4982ff96bb25db85290c09e8de4ec734" "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734"
}, },
"_source": "git://github.com/polymerelements/iron-icon.git", "_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon" "_originalSource": "PolymerElements/iron-icon"
} }

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

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6" "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
}, },
"private": true, "private": true,
"homepage": "https://github.com/polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.1", "_release": "1.6.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.1", "tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.1.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }

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

@ -518,6 +518,12 @@
self.play = function (options) { self.play = function (options) {
if (options.enableRemotePlayers === false) {
if (!currentPlayer.isLocalPlayer) {
return;
}
}
doWithPlaybackValidation(currentPlayer, function () { doWithPlaybackValidation(currentPlayer, function () {
if (typeof (options) === 'string') { if (typeof (options) === 'string') {
options = { ids: [options] }; options = { ids: [options] };