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 components

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-03 18:48:33 -05:00
parent 46f2a6fc15
commit 7c5dabe06d
6 changed files with 19 additions and 15 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.109", "version": "1.1.110",
"_release": "1.1.109", "_release": "1.1.110",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.109", "tag": "1.1.110",
"commit": "04821a9677127cb08a156986385d3345ea9d7e74" "commit": "ab24c293c88728733789d3fcdf127d18294a6148"
}, },
"_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

@ -216,7 +216,7 @@
return connectUser; return connectUser;
}; };
var minServerVersion = '3.0.7200'; var minServerVersion = '3.0.8000';
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.438", "version": "1.4.439",
"_release": "1.4.438", "_release": "1.4.439",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.438", "tag": "1.4.439",
"commit": "088b06ac2ac3e7d330b767ebb1cc4be28ff9f434" "commit": "83d5b3f38e168da5f42415f346c8d624fc8523e8"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

2
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css vendored
View file

@ -97,7 +97,7 @@
} }
.actionSheetTitle { .actionSheetTitle {
margin: .5em 0 1em !important; margin: .5em 0 !important;
padding: 0 1em; padding: 0 1em;
flex-grow: 0; flex-grow: 0;
} }

8
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -90,8 +90,10 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
self.setActivePlayer = function (player, targetInfo) { self.setActivePlayer = function (player, targetInfo) {
if (player === 'localplayer' || player.name === 'localplayer') { if (player === 'localplayer' || player.name === 'localplayer') {
if (currentPlayer && currentPlayer.isLocalPlayer) {
return;
}
setCurrentPlayerInternal(null, null); setCurrentPlayerInternal(null, null);
return;
} }
if (typeof (player) === 'string') { if (typeof (player) === 'string') {
@ -115,7 +117,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
self.trySetActivePlayer = function (player, targetInfo) { self.trySetActivePlayer = function (player, targetInfo) {
if (player === 'localplayer' || player.name === 'localplayer') { if (player === 'localplayer' || player.name === 'localplayer') {
setCurrentPlayerInternal(null, null); if (currentPlayer && currentPlayer.isLocalPlayer) {
return;
}
return; return;
} }

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

@ -423,14 +423,14 @@
function onPlayerChange() { function onPlayerChange() {
var currentPlayer = playbackManager.getCurrentPlayer(); var player = playbackManager.getCurrentPlayer();
if (currentPlayer && !currentPlayer.isLocalPlayer) { if (player && !player.isLocalPlayer) {
view.querySelector('.btnCast i').innerHTML = ''; view.querySelector('.btnCast i').innerHTML = '';
} else { } else {
view.querySelector('.btnCast i').innerHTML = ''; view.querySelector('.btnCast i').innerHTML = '';
} }
bindToPlayer(currentPlayer); bindToPlayer(player);
} }
function onStateChanged(event, state) { function onStateChanged(event, state) {