diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 0f5a5bafbd..2d823638ed 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.170", - "_release": "1.4.170", + "version": "1.4.171", + "_release": "1.4.171", "_resolution": { "type": "version", - "tag": "1.4.170", - "commit": "61f0b1c9783d19db9b76882badbf575500dea6e9" + "tag": "1.4.171", + "commit": "388435c54b3b15c417b8d76701cf09b42b968a08" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css index 3e8776e18c..c2a432ccdb 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css @@ -65,6 +65,8 @@ margin: 0; transition: none; border: 3px solid transparent; + /* Needed in case cardBox is a button */ + background-color: transparent; } .cardBox-focustransform { diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js index 2078a93430..4e338bac73 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js +++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js @@ -355,6 +355,10 @@ return true; } + if (options.size) { + return true; + } + return browser.touch; } @@ -424,8 +428,8 @@ var exitAnimation = options.exitAnimation || defaultExitAnimation; // If it's not fullscreen then lower the default animation speed to make it open really fast - var entryAnimationDuration = options.entryAnimationDuration || (options.size ? 200 : 300); - var exitAnimationDuration = options.exitAnimationDuration || (options.size ? 200 : 300); + var entryAnimationDuration = options.entryAnimationDuration || (options.size ? 180 : 280); + var exitAnimationDuration = options.exitAnimationDuration || (options.size ? 180 : 280); dlg.animationConfig = { // scale up diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.css b/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.css index 0951f3e301..5d1d6d8052 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.css +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.css @@ -63,32 +63,5 @@ } .emby-tab-button-ripple-effect { - position: absolute !important; - top: 0 !important; - left: 0 !important; - right: 0 !important; - bottom: 0 !important; - width: auto !important; - height: auto !important; - background: #181818 !important; - animation: emby-tab-button-ripple-animation .5s !important; - transform-origin: center center !important; - border-radius: 0; -} - -@keyframes emby-tab-button-ripple-animation { - 0% { - transform: scale(.2, 1); - opacity: 0.5; - } - - 50% { - transform: none; - opacity: 1; - } - - 100% { - transform: none; - opacity: 0; - } + background: #141414 !important; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.js b/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.js index 3c1dec1fd2..8b92f6a76b 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.js +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.js @@ -42,13 +42,16 @@ elem.classList.add('emby-tab-button-selection-bar-active'); } - function animtateSelectionBar(bar, start, pos, duration) { + function animtateSelectionBar(bar, start, pos, duration, onFinish) { var endTransform = pos ? ('translateX(' + pos + 'px)') : 'none'; var startTransform = start ? ('translateX(' + start + 'px)') : 'none'; if (!duration || !bar.animate) { bar.style.transform = endTransform; + if (onFinish) { + onFinish(); + } return; } @@ -61,9 +64,9 @@ bar.animate(keyframes, { duration: duration, iterations: 1, - easing: 'ease-out', + easing: 'linear', fill: 'forwards' - }); + }).onFinish = onFinish; } function moveSelectionBar(tabs, newButton, oldButton, animate) { @@ -99,22 +102,26 @@ endPosition = tabButtonOffset.left - tabsOffset.left; } - var delay = animate ? 180 : 0; - if (selectionBar) { - animtateSelectionBar(selectionBar, startOffset, endPosition, delay); - } + var delay = animate ? 100 : 0; tabs.currentOffset = endPosition; - newButton.classList.add(activeButtonClass); - setTimeout(function () { + var onAnimationFinish = function() { - showButtonSelectionBar(newButton); + if (tabs.getAttribute('data-selectionbar') != 'false') { + showButtonSelectionBar(newButton); + } if (selectionBar) { selectionBar.classList.add('hide'); } - }, delay); + }; + + if (selectionBar) { + animtateSelectionBar(selectionBar, startOffset, endPosition, delay, onAnimationFinish); + } else { + onAnimationFinish(); + } } function onClick(e) { @@ -207,6 +214,10 @@ return; } + if (tabs.getAttribute('data-selectionbar') == 'false') { + return; + } + var elem = document.createElement('div'); elem.classList.add('emby-tabs-selection-bar'); diff --git a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js index 2f2006f5e2..4398052aa9 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js @@ -1172,9 +1172,6 @@ var dlg = dialogHelper.createDialog(dialogOptions); - dlg.classList.add('ui-body-b'); - dlg.classList.add('background-theme-b'); - dlg.classList.add('formDialog'); var html = ''; diff --git a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js index 7feac2dbac..76c235b66d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js @@ -25,9 +25,6 @@ var dlg = dialogHelper.createDialog(dialogOptions); - dlg.classList.add('ui-body-b'); - dlg.classList.add('background-theme-b'); - dlg.classList.add('formDialog'); var html = ''; diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index 87e3dad5d3..f76855b27a 100644 --- a/dashboard-ui/bower_components/iron-icon/.bower.json +++ b/dashboard-ui/bower_components/iron-icon/.bower.json @@ -32,14 +32,14 @@ "web-component-tester": "^4.0.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", "_resolution": { "type": "version", "tag": "v1.0.10", "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734" }, - "_source": "git://github.com/polymerelements/iron-icon.git", + "_source": "git://github.com/PolymerElements/iron-icon.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-icon" + "_originalSource": "PolymerElements/iron-icon" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index 25eb84c037..a96f0f050e 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -32,14 +32,14 @@ "iron-component-page": "polymerElements/iron-component-page#^1.1.6" }, "private": true, - "homepage": "https://github.com/polymer/polymer", + "homepage": "https://github.com/Polymer/polymer", "_release": "1.6.1", "_resolution": { "type": "version", "tag": "v1.6.1", "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" }, - "_source": "git://github.com/polymer/polymer.git", + "_source": "git://github.com/Polymer/polymer.git", "_target": "^1.1.0", - "_originalSource": "polymer/polymer" + "_originalSource": "Polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/components/dockedtabs/dockedtabs.css b/dashboard-ui/components/dockedtabs/dockedtabs.css index f9dd7bcbff..1fc63186c3 100644 --- a/dashboard-ui/components/dockedtabs/dockedtabs.css +++ b/dashboard-ui/components/dockedtabs/dockedtabs.css @@ -1,10 +1,11 @@ .dockedtabs { - height: 60px; + height: 54px; background: #212121; position: fixed; left: 0; right: 0; - z-index: 99999; + z-index: 1; + display: flex; } .dockedtabs-bottom { @@ -22,3 +23,29 @@ .dockedtabs--unpinned { transform: translateY(100%); } + +.dockedtabs-tabs { + flex-grow: 1; + display: flex; +} + +.dockedtabs-tab-button { + flex-grow: 1; + display: flex !important; + align-items: center; + justify-content: center; + text-transform: none !important; + font-size: 12px !important; + padding: 0 !important; + margin: 0 !important; + text-align: center; +} + +.dockedtabs-tab-button, .dockedtabs-tab-button-foreground { + font-weight: normal !important; +} + +.dockedtabs-tab-button-icon { + margin-bottom: .25em; + font-size: 20px; +} diff --git a/dashboard-ui/components/dockedtabs/dockedtabs.js b/dashboard-ui/components/dockedtabs/dockedtabs.js index 791244bea9..f5cd853b2e 100644 --- a/dashboard-ui/components/dockedtabs/dockedtabs.js +++ b/dashboard-ui/components/dockedtabs/dockedtabs.js @@ -1,4 +1,4 @@ -define(['css!./dockedtabs'], function () { +define(['css!./dockedtabs', 'emby-tabs'], function () { function render(options) { @@ -13,6 +13,29 @@ // live tv // now playing + var html = ''; + + html += '
\ + \ + \ + \ + \ + \ +
\ +'; + + elem.innerHTML = html; + document.body.appendChild(elem); return elem; diff --git a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js index 8628d02c5e..ce2c4a8c0c 100644 --- a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js +++ b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js @@ -33,6 +33,12 @@ parent.querySelector('.chkArhiveAsMediaContainer').classList.add('hide'); } + if (contentType == 'homevideos') { + parent.querySelector('.chkEnablePhotosContainer').classList.remove('hide'); + } else { + parent.querySelector('.chkEnablePhotosContainer').classList.add('hide'); + } + if (contentType == 'music' || contentType == 'tvshows' || contentType == 'movies' || contentType == 'homevideos' || contentType == 'musicvideos' || contentType == 'mixed') { parent.classList.remove('hide'); } else { @@ -43,7 +49,8 @@ function getLibraryOptions(parent) { var options = { - EnableArchiveMediaFiles: parent.querySelector('.chkArhiveAsMedia').checked + EnableArchiveMediaFiles: parent.querySelector('.chkArhiveAsMedia').checked, + EnablePhotos: parent.querySelector('.chkEnablePhotos').checked }; return options; @@ -51,7 +58,8 @@ function setLibraryOptions(parent, options) { - parent.querySelector('.chkArhiveAsMedia').checked = options.EnableArchiveMediaFiles;; + parent.querySelector('.chkArhiveAsMedia').checked = options.EnableArchiveMediaFiles; + parent.querySelector('.chkEnablePhotos').checked = options.EnablePhotos; } return { diff --git a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html index 8ce697d914..db90088b41 100644 --- a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html +++ b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html @@ -1,4 +1,11 @@ 

${HeaderSettings}

+
+ +
${EnablePhotosHelp}
+