cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1745 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-05-18 01:38:57 -04:00
commit 4bbff4ce4c
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.3.41", "version": "1.3.43",
"_release": "1.3.41", "_release": "1.3.43",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.3.41", "tag": "1.3.43",
"commit": "b99e1de0001cc6c56af28b79cf0561f1cb25743f" "commit": "201076c748374aa6fed4be70ec43198099854aa8"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

4
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html vendored
View File

@ -9,8 +9,8 @@
<h1 class="itemName dialogContentTitle"></h1> <h1 class="itemName dialogContentTitle"></h1>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p class="itemMiscInfoPrimary" style="display: flex; align-items: center;"></p> <p class="itemMiscInfoPrimary" style="display: flex; align-items: center; flex-wrap: wrap;"></p>
<p class="itemMiscInfoSecondary" style="display: flex; align-items: center;"></p> <p class="itemMiscInfoSecondary" style="display: flex; align-items: center; flex-wrap: wrap;"></p>
<div id="eligibleForSeriesFields" class="hide"> <div id="eligibleForSeriesFields" class="hide">
<br /> <br />

4
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html vendored
View File

@ -15,8 +15,8 @@
<div class="dialogContentInner centeredContent"> <div class="dialogContentInner centeredContent">
<h1 class="itemName dialogContentTitle"></h1> <h1 class="itemName dialogContentTitle"></h1>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p class="itemMiscInfoPrimary" style="display: flex; align-items: center;"></p> <p class="itemMiscInfoPrimary" style="display: flex; align-items: center; flex-wrap: wrap;"></p>
<p class="itemMiscInfoSecondary" style="display: flex; align-items: center;"></p> <p class="itemMiscInfoSecondary" style="display: flex; align-items: center; flex-wrap: wrap;"></p>
<p class="itemGenres"></p> <p class="itemGenres"></p>
<p class="itemOverview"></p> <p class="itemOverview"></p>

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View File

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"homepage": "https://github.com/PolymerElements/iron-meta", "homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
}, },
"_source": "git://github.com/PolymerElements/iron-meta.git", "_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta" "_originalSource": "polymerelements/iron-meta"
} }

4
dashboard-ui/scripts/librarybrowser.js
View File

@ -32,6 +32,10 @@
var elem = button.querySelector('.pageTabButtonSelectionBar'); var elem = button.querySelector('.pageTabButtonSelectionBar');
if (!elem) {
return;
}
var keyframes = [ var keyframes = [
{ transform: 'translate3d(-100%, 0, 0)', offset: 0 }, { transform: 'translate3d(-100%, 0, 0)', offset: 0 },
{ transform: 'none', offset: 1 }]; { transform: 'none', offset: 1 }];

11
dashboard-ui/scripts/search.js
View File

@ -1,4 +1,4 @@
define(['libraryBrowser', 'scrollStyles'], function (libraryBrowser) { define(['libraryBrowser', 'events', 'scrollStyles'], function (libraryBrowser, events) {
var searchHintTimeout; var searchHintTimeout;
@ -231,8 +231,8 @@
function bindSearchEvents() { function bindSearchEvents() {
require(['searchmenu'], function (searchmenu) { require(['searchmenu'], function (searchmenu) {
Events.on(window.SearchMenu, 'closed', closeSearchResults); events.on(window.SearchMenu, 'closed', closeSearchResults);
Events.on(window.SearchMenu, 'change', function (e, value) { events.on(window.SearchMenu, 'change', function (e, value) {
onHeaderSearchChange(value); onHeaderSearchChange(value);
}); });
@ -257,11 +257,14 @@
}); });
} }
document.addEventListener('pagebeforehide', closeSearchResults); document.addEventListener('viewbeforehide', closeSearchResults);
document.addEventListener('headercreated', function () { document.addEventListener('headercreated', function () {
bindSearchEvents(); bindSearchEvents();
}); });
// dismiss search UI if user clicks a play button on a search result
events.on(MediaController, 'beforeplaybackstart', closeSearchResults);
}); });