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

update components

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-04 12:01:54 -05:00
parent da4fe2588b
commit 7dbb1f7535
4 changed files with 15 additions and 25 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.0.42", "version": "1.0.43",
"_release": "1.0.42", "_release": "1.0.43",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.42", "tag": "1.0.43",
"commit": "75aecc7f13e58f0f997afa7fdb37bc8326928fdd" "commit": "5c5aeb79353f3a7d3e20a456d6f1506d660f8626"
}, },
"_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "~1.0.3", "_target": "~1.0.3",

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

@ -1519,23 +1519,20 @@
return self.getAvailableServers().then(function (servers) { return self.getAvailableServers().then(function (servers) {
var currentServerId = apiClient.serverInfo().Id;
var matchedServers = servers.filter(function (s) { var matchedServers = servers.filter(function (s) {
return stringEqualsIgnoreCase(s.Id, apiClient.serverInfo().Id); return stringEqualsIgnoreCase(s.Id, currentServerId);
}); });
if (!matchedServers.length) { var match = matchedServers.length ? matchedServers[0] : null;
return {}; var dateLastLocalConnection = match ? match.DateLastLocalConnection : null;
} if (!dateLastLocalConnection) {
var match = matchedServers[0]; return apiClient.getJSON(apiClient.getUrl('System/Endpoint')).then(function (info) {
if (!match.DateLastLocalConnection) {
return ApiClient.getJSON(ApiClient.getUrl('System/Endpoint')).then(function (info) {
if (info.IsInNetwork) { if (info.IsInNetwork) {
updateDateLastLocalConnection(match.Id); updateDateLastLocalConnection(currentServerId);
return apiClient.getRegistrationInfo(feature); return apiClient.getRegistrationInfo(feature);
} else { } else {
return {}; return {};

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

@ -31,14 +31,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"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.7", "_release": "1.0.7",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.7", "tag": "v1.0.7",
"commit": "6f4d152dc3998a6cc12a5a585a654f893dc99381" "commit": "6f4d152dc3998a6cc12a5a585a654f893dc99381"
}, },
"_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"
} }

9
dashboard-ui/nowplaying.html
View file

@ -31,7 +31,7 @@
<div class="nowPlayingPageImage" style="margin: 1em auto;"></div> <div class="nowPlayingPageImage" style="margin: 1em auto;"></div>
<div class="nowPlayingPageTimeContainer"> <div class="nowPlayingPageTimeContainer">
<div> <div>
<paper-slider pin step="1" min="0" max="100" value="0" class="nowPlayingPositionSlider"></paper-slider> <paper-slider pin step="1" min="0" max="100" value="0" class="nowPlayingPositionSlider" style="width: 100%;"></paper-slider>
</div> </div>
<div style="text-align:left;"> <div style="text-align:left;">
<div class="positionTime" style="float:left;"></div> <div class="positionTime" style="float:left;"></div>
@ -56,9 +56,6 @@
<paper-fab icon="movie" class="btnChapters videoButton btnPlayStateCommand subdued" title="${ButtonScenes}" data-command="GoToSearch"></paper-fab> <paper-fab icon="movie" class="btnChapters videoButton btnPlayStateCommand subdued" title="${ButtonScenes}" data-command="GoToSearch"></paper-fab>
<paper-fab icon="fullscreen" class="btnToggleFullscreen videoButton btnPlayStateCommand subdued" title="${ButtonFullscreen}" data-command="ToggleFullscreen"></paper-fab> <paper-fab icon="fullscreen" class="btnToggleFullscreen videoButton btnPlayStateCommand subdued" title="${ButtonFullscreen}" data-command="ToggleFullscreen"></paper-fab>
</div> </div>
<!--<div class="buttonsRow3">
<paper-fab icon="info" class="btnCommand videoButton subdued" title="${ButtonOsd}" data-command="ToggleOsdMenu"></paper-fab>
</div>-->
<div> <div>
<paper-fab icon="repeat" class="btnCommand subdued repeatToggleButton" title="${ButtonRepeat}" data-command="SetRepeatMode"></paper-fab> <paper-fab icon="repeat" class="btnCommand subdued repeatToggleButton" title="${ButtonRepeat}" data-command="SetRepeatMode"></paper-fab>
<paper-fab icon="volume-off" class="btnCommand subdued volumeButton" title="${ButtonMute}" data-command="ToggleMute"></paper-fab> <paper-fab icon="volume-off" class="btnCommand subdued volumeButton" title="${ButtonMute}" data-command="ToggleMute"></paper-fab>
@ -90,14 +87,10 @@
<br /> <br />
<div> <div>
<paper-fab icon="home" class="btnGoHome btnCommand subdued" title="${ButtonHome}" data-command="GoHome"></paper-fab> <paper-fab icon="home" class="btnGoHome btnCommand subdued" title="${ButtonHome}" data-command="GoHome"></paper-fab>
<!--<button data-inline="true" data-iconpos="right" title="${ButtonPageUp}" data-icon="plus" class="btnPageUp btnCommand ui-nodisc-icon" data-command="PageUp">${PageButtonAbbreviation}</button>
<button data-inline="true" data-iconpos="right" title="${ButtonLetterUp}" data-icon="plus" class="btnLetterUp btnCommand ui-nodisc-icon" data-command="NextLetter">${LetterButtonAbbreviation}</button>-->
<paper-fab icon="search" class="btnShowSearch btnCommand subdued" title="${ButtonSearch}" data-command="GoToSearch"></paper-fab> <paper-fab icon="search" class="btnShowSearch btnCommand subdued" title="${ButtonSearch}" data-command="GoToSearch"></paper-fab>
</div> </div>
<div> <div>
<paper-fab icon="settings" class="bthShowSettings btnCommand subdued" title="${ButtonSettings}" data-command="GoToSettings"></paper-fab> <paper-fab icon="settings" class="bthShowSettings btnCommand subdued" title="${ButtonSettings}" data-command="GoToSettings"></paper-fab>
<!--<button data-inline="true" data-iconpos="right" title="${ButtonPageDown}" data-icon="minus" class="btnPageDown btnCommand ui-nodisc-icon" data-command="PageDown">${PageButtonAbbreviation}</button>
<button data-inline="true" data-iconpos="right" title="${ButtonLetterDown}" data-icon="minus" class="btnLetterDown btnCommand ui-nodisc-icon" data-command="PreviousLetter">${LetterButtonAbbreviation}</button>-->
<paper-fab icon="videocam" class="btnScreenshot btnCommand subdued" title="${ButtonTakeScreenshot}" data-command="TakeScreenshot"></paper-fab> <paper-fab icon="videocam" class="btnScreenshot btnCommand subdued" title="${ButtonTakeScreenshot}" data-command="TakeScreenshot"></paper-fab>
</div> </div>
</div> </div>