mirror of
https://github.com/jellyfin/jellyfin-web.git
synced 2024-11-18 03:18:19 -07:00
update now playing page
This commit is contained in:
parent
9ab9e8b9c8
commit
d61dd06176
@ -29,14 +29,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-a11y-keys-behavior",
|
"homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior",
|
||||||
"_release": "1.0.5",
|
"_release": "1.0.5",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.0.5",
|
"tag": "v1.0.5",
|
||||||
"commit": "cf833eab5c55a26c5aa92e56d3fcb079120ce66a"
|
"commit": "cf833eab5c55a26c5aa92e56d3fcb079120ce66a"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git",
|
"_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
"_originalSource": "PolymerElements/iron-a11y-keys-behavior"
|
"_originalSource": "polymerelements/iron-a11y-keys-behavior"
|
||||||
}
|
}
|
@ -27,14 +27,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-behaviors",
|
"homepage": "https://github.com/polymerelements/iron-behaviors",
|
||||||
"_release": "1.0.8",
|
"_release": "1.0.8",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.0.8",
|
"tag": "v1.0.8",
|
||||||
"commit": "663ad706b43989f4961d945b8116cf4db346532f"
|
"commit": "663ad706b43989f4961d945b8116cf4db346532f"
|
||||||
},
|
},
|
||||||
"_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"
|
||||||
}
|
}
|
@ -50,7 +50,7 @@
|
|||||||
"tag": "v1.0.14",
|
"tag": "v1.0.14",
|
||||||
"commit": "120a0610aca5c86194977e30f696b09716f93bbc"
|
"commit": "120a0610aca5c86194977e30f696b09716f93bbc"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/PolymerElements/paper-input.git",
|
"_source": "git://github.com/polymerelements/paper-input.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.9",
|
||||||
"_originalSource": "PolymerElements/paper-input"
|
"_originalSource": "polymerelements/paper-input"
|
||||||
}
|
}
|
@ -30,14 +30,14 @@
|
|||||||
"web-component-tester": "*",
|
"web-component-tester": "*",
|
||||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/polymerelements/paper-ripple",
|
"homepage": "https://github.com/PolymerElements/paper-ripple",
|
||||||
"_release": "1.0.2",
|
"_release": "1.0.2",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.0.2",
|
"tag": "v1.0.2",
|
||||||
"commit": "b546dbe6ad0b1f58cac80caec3136cf3232e12fc"
|
"commit": "b546dbe6ad0b1f58cac80caec3136cf3232e12fc"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/polymerelements/paper-ripple.git",
|
"_source": "git://github.com/PolymerElements/paper-ripple.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
"_originalSource": "polymerelements/paper-ripple"
|
"_originalSource": "PolymerElements/paper-ripple"
|
||||||
}
|
}
|
19
dashboard-ui/cordova/ios/backgroundfetch.js
vendored
19
dashboard-ui/cordova/ios/backgroundfetch.js
vendored
@ -7,7 +7,7 @@
|
|||||||
var fetcher = window.BackgroundFetch;
|
var fetcher = window.BackgroundFetch;
|
||||||
|
|
||||||
fetcher.configure(onBackgroundFetch, onBackgroundFetchFailed, {
|
fetcher.configure(onBackgroundFetch, onBackgroundFetchFailed, {
|
||||||
stopOnTerminate: false // <-- false is default
|
stopOnTerminate: true // <-- false is default
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -27,7 +27,7 @@
|
|||||||
fetcher.finish(); // <-- N.B. You MUST called #finish so that native-side can signal completion of the background-thread to the os.
|
fetcher.finish(); // <-- N.B. You MUST called #finish so that native-side can signal completion of the background-thread to the os.
|
||||||
}
|
}
|
||||||
|
|
||||||
function startSync(uploadPhotos) {
|
function startSync(reportToFetcher) {
|
||||||
lastStart = new Date().getTime();
|
lastStart = new Date().getTime();
|
||||||
|
|
||||||
require(['localsync'], function () {
|
require(['localsync'], function () {
|
||||||
@ -37,11 +37,11 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var syncOptions = {
|
var promise = LocalSync.sync();
|
||||||
uploadPhotos: uploadPhotos
|
|
||||||
};
|
|
||||||
|
|
||||||
LocalSync.sync(syncOptions).done(onSyncFinish).fail(onSyncFail);
|
if (reportToFetcher) {
|
||||||
|
promise.done(onSyncFinish).fail(onSyncFail);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,12 +61,15 @@
|
|||||||
|
|
||||||
setInterval(function () {
|
setInterval(function () {
|
||||||
|
|
||||||
//startSync(true);
|
startSync();
|
||||||
|
|
||||||
}, syncInterval);
|
}, syncInterval);
|
||||||
|
|
||||||
if (lastStart > 0 && (now - lastStart) >= syncInterval) {
|
if (lastStart > 0 && (now - lastStart) >= syncInterval) {
|
||||||
//startSync(true);
|
|
||||||
|
setTimeout(function () {
|
||||||
|
startSync();
|
||||||
|
}, 3000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,11 +2,18 @@
|
|||||||
padding-top: 0 !important;
|
padding-top: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nowPlayingPage .btnCommand, .nowPlayingPage .btnPlayStateCommand {
|
.nowPlayingPagePaperTabs.bottom {
|
||||||
margin: 2px 1px;
|
position: fixed;
|
||||||
width: 70px;
|
bottom: 0;
|
||||||
height: 70px;
|
left: 0;
|
||||||
}
|
right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nowPlayingPage .btnCommand, .nowPlayingPage .btnPlayStateCommand {
|
||||||
|
margin: 2px 1px;
|
||||||
|
width: 70px;
|
||||||
|
height: 70px;
|
||||||
|
}
|
||||||
|
|
||||||
.nowPlayingPageImage img {
|
.nowPlayingPageImage img {
|
||||||
max-height: 360px;
|
max-height: 360px;
|
||||||
|
@ -6,6 +6,14 @@
|
|||||||
<body>
|
<body>
|
||||||
<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="jqmcollapsible,scripts/nowplayingpage,paperbuttonstyle">
|
<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="jqmcollapsible,scripts/nowplayingpage,paperbuttonstyle">
|
||||||
|
|
||||||
|
<paper-tabs selected="{{selected}}" class="nowPlayingPagePaperTabs" hidescrollbuttons noink>
|
||||||
|
|
||||||
|
<paper-tab>${TabNowPlaying}</paper-tab>
|
||||||
|
<paper-tab>${TabControls}</paper-tab>
|
||||||
|
<paper-tab>${TabPlaylist}</paper-tab>
|
||||||
|
|
||||||
|
</paper-tabs>
|
||||||
|
|
||||||
<div data-role="content" style="overflow:visible;">
|
<div data-role="content" style="overflow:visible;">
|
||||||
|
|
||||||
<paper-fab mini icon="arrow-back" class="white nowPlayingPageBackButton" onclick="history.back()" style="position:relative;top:5px;left:5px;"></paper-fab>
|
<paper-fab mini icon="arrow-back" class="white nowPlayingPageBackButton" onclick="history.back()" style="position:relative;top:5px;left:5px;"></paper-fab>
|
||||||
@ -149,14 +157,6 @@
|
|||||||
</neon-animatable>
|
</neon-animatable>
|
||||||
</neon-animated-pages>
|
</neon-animated-pages>
|
||||||
|
|
||||||
<paper-tabs selected="{{selected}}" style="position:fixed;bottom:0;left:0;right:0;" class="bottomTabs nowPlayingPagePaperTabs" hidescrollbuttons noink>
|
|
||||||
|
|
||||||
<paper-tab>${TabNowPlaying}</paper-tab>
|
|
||||||
<paper-tab>${TabControls}</paper-tab>
|
|
||||||
<paper-tab>${TabPlaylist}</paper-tab>
|
|
||||||
|
|
||||||
</paper-tabs>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="chapterMenuOverlay" style="display: none;"></div>
|
<div class="chapterMenuOverlay" style="display: none;"></div>
|
||||||
|
@ -773,7 +773,13 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
var tabs = page.querySelector('paper-tabs');
|
var tabs = page.querySelector('paper-tabs');
|
||||||
tabs.alignBottom = true;
|
|
||||||
|
if (AppInfo.enableNowPlayingPageBottomTabs) {
|
||||||
|
tabs.alignBottom = true;
|
||||||
|
tabs.classList.add('bottom');
|
||||||
|
} else {
|
||||||
|
tabs.classList.remove('bottom');
|
||||||
|
}
|
||||||
|
|
||||||
LibraryBrowser.configureSwipeTabs(page, tabs, page.querySelectorAll('neon-animated-pages')[0]);
|
LibraryBrowser.configureSwipeTabs(page, tabs, page.querySelectorAll('neon-animated-pages')[0]);
|
||||||
|
|
||||||
|
@ -1728,6 +1728,7 @@ var AppInfo = {};
|
|||||||
AppInfo.enableNowPlayingBar = true;
|
AppInfo.enableNowPlayingBar = true;
|
||||||
AppInfo.enableCustomHomeSections = true;
|
AppInfo.enableCustomHomeSections = true;
|
||||||
AppInfo.enableHomeTabs = true;
|
AppInfo.enableHomeTabs = true;
|
||||||
|
AppInfo.enableNowPlayingPageBottomTabs = true;
|
||||||
|
|
||||||
AppInfo.enableAppStorePolicy = isCordova;
|
AppInfo.enableAppStorePolicy = isCordova;
|
||||||
|
|
||||||
@ -1749,6 +1750,7 @@ var AppInfo = {};
|
|||||||
AppInfo.enableNowPlayingBar = false;
|
AppInfo.enableNowPlayingBar = false;
|
||||||
AppInfo.enableCustomHomeSections = false;
|
AppInfo.enableCustomHomeSections = false;
|
||||||
AppInfo.enableHomeTabs = false;
|
AppInfo.enableHomeTabs = false;
|
||||||
|
AppInfo.enableNowPlayingPageBottomTabs = false;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (isMobile) {
|
if (isMobile) {
|
||||||
|
@ -154,6 +154,13 @@ h1, h1 a {
|
|||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media all and (max-width: 400px) {
|
||||||
|
|
||||||
|
.libraryMenuButtonText {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.libraryPanelHeader span {
|
.libraryPanelHeader span {
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
@ -218,7 +225,3 @@ paper-tab {
|
|||||||
.nowPlayingPageBackButton {
|
.nowPlayingPageBackButton {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nowPlayingPagePaperTabs {
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
|
@ -255,10 +255,6 @@ paper-tabs {
|
|||||||
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2);
|
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
paper-tabs.bottomTabs {
|
|
||||||
box-shadow: 0px -2px 6px rgba(0, 0, 0, 0.15);
|
|
||||||
}
|
|
||||||
|
|
||||||
paper-tab {
|
paper-tab {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
|
Loading…
Reference in New Issue
Block a user