1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update components

This commit is contained in:
Luke Pulverenti 2016-07-07 14:12:08 -04:00
parent b4e32e14d4
commit 91127df6f0
21 changed files with 65 additions and 35 deletions

View file

@ -15,12 +15,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.71", "version": "1.4.73",
"_release": "1.4.71", "_release": "1.4.73",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.71", "tag": "1.4.73",
"commit": "0613abc5976a0da9db22854809449e09517ae2b6" "commit": "5e4922dc23251974102519fa892f452c8bc7f670"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -85,6 +85,11 @@ h2.actionSheetTitle {
flex-grow: 0; flex-grow: 0;
} }
.actionSheetText {
padding: 0 1em;
flex-grow: 0;
}
.actionSheet.extraSpacing { .actionSheet.extraSpacing {
font-size: 108%; font-size: 108%;
} }

View file

@ -140,6 +140,11 @@
html += '</h2>'; html += '</h2>';
} }
} }
if (options.text) {
html += '<p class="actionSheetText">';
html += options.text;
html += '</p>';
}
var scrollType = layoutManager.desktop ? 'smoothScrollY' : 'hiddenScrollY'; var scrollType = layoutManager.desktop ? 'smoothScrollY' : 'hiddenScrollY';
var style = (browser.noFlex || browser.firefox) ? 'max-height:400px;' : ''; var style = (browser.noFlex || browser.firefox) ? 'max-height:400px;' : '';

View file

@ -44,7 +44,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'material-icons', 'css!./.
html += '<div class="promptDialogContent">'; html += '<div class="promptDialogContent">';
if (backButton) { if (backButton) {
html += getIcon('arrow_back', 'btnPromptExit', false); html += getIcon('&#xE5C4;', 'btnPromptExit', false);
} }
if (options.title) { if (options.title) {

View file

@ -77,7 +77,6 @@
function cancelAnimation() { function cancelAnimation() {
var animation = currentAnimation; var animation = currentAnimation;
if (animation) { if (animation) {
console.log('Cancelling backdrop animation');
animation.cancel(); animation.cancel();
currentAnimation = null; currentAnimation = null;
} }

View file

@ -243,7 +243,7 @@
var title = items.length ? globalize.translate('sharedcomponents#AddToCollection') : globalize.translate('sharedcomponents#NewCollection'); var title = items.length ? globalize.translate('sharedcomponents#AddToCollection') : globalize.translate('sharedcomponents#NewCollection');
html += '<div class="dialogHeader" style="margin:0 0 2em;">'; html += '<div class="dialogHeader" style="margin:0 0 2em;">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
html += '<div class="dialogHeaderTitle">'; html += '<div class="dialogHeaderTitle">';
html += title; html += title;
html += '</div>'; html += '</div>';

View file

@ -22,7 +22,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
// Full list // Full list
// https://github.com/MediaBrowser/MediaBrowser/blob/master/MediaBrowser.Model/Session/GeneralCommand.cs#L23 // https://github.com/MediaBrowser/MediaBrowser/blob/master/MediaBrowser.Model/Session/GeneralCommand.cs#L23
console.log('Received command: ' + cmd.Name); //console.log('Received command: ' + cmd.Name);
switch (cmd.Name) { switch (cmd.Name) {

View file

@ -224,7 +224,7 @@
var title = globalize.translate('sharedcomponents#AddToPlaylist'); var title = globalize.translate('sharedcomponents#AddToPlaylist');
html += '<div class="dialogHeader" style="margin:0 0 2em;">'; html += '<div class="dialogHeader" style="margin:0 0 2em;">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
html += '<div class="dialogHeaderTitle">'; html += '<div class="dialogHeaderTitle">';
html += title; html += title;
html += '</div>'; html += '</div>';

View file

@ -43,7 +43,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'material-icons', 'css!./s
html += '<div class="promptDialogContent">'; html += '<div class="promptDialogContent">';
if (backButton) { if (backButton) {
html += getIcon('arrow_back', 'btnPromptExit', false); html += getIcon('&#xE5C4;', 'btnPromptExit', false);
} }
if (options.title) { if (options.title) {

View file

@ -1,5 +1,5 @@
<div class="dialogHeader"> <div class="dialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
<div class="dialogHeaderTitle"> <div class="dialogHeaderTitle">
${HeaderNewRecording} ${HeaderNewRecording}
</div> </div>

View file

@ -1,5 +1,5 @@
<div class="dialogHeader"> <div class="dialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
<div class="dialogHeaderTitle"> <div class="dialogHeaderTitle">
${Edit} ${Edit}
</div> </div>

View file

@ -115,7 +115,7 @@
var title = globalize.translate('sharedcomponents#RefreshMetadata'); var title = globalize.translate('sharedcomponents#RefreshMetadata');
html += '<div class="dialogHeader" style="margin:0 0 2em;">'; html += '<div class="dialogHeader" style="margin:0 0 2em;">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
html += '<div class="dialogHeaderTitle">'; html += '<div class="dialogHeaderTitle">';
html += title; html += title;
html += '</div>'; html += '</div>';

View file

@ -1,5 +1,5 @@
<div class="dialogHeader"> <div class="dialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
<div class="dialogHeaderTitle">${Subtitles}</div> <div class="dialogHeaderTitle">${Subtitles}</div>
</div> </div>
<div class="dialogContent smoothScrollY"> <div class="dialogContent smoothScrollY">

View file

@ -113,7 +113,7 @@ define(['dialogHelper', './voicereceiver', './voiceprocessor', 'globalize', 'emb
var html = ''; var html = '';
html += '<div class="dialogHeader" style="margin:0 0 1em;">'; html += '<div class="dialogHeader" style="margin:0 0 1em;">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize btnCancelVoiceInput" tabindex="-1"><i class="md-icon">arrow_back</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize btnCancelVoiceInput" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
html += '<div class="dialogHeaderTitle" id="voiceDialogGroupName">'; html += '<div class="dialogHeaderTitle" id="voiceDialogGroupName">';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';

View file

@ -1,6 +1,6 @@
{ {
"name": "iron-menu-behavior", "name": "iron-menu-behavior",
"version": "1.1.7", "version": "1.1.8",
"description": "Provides accessible menu behavior", "description": "Provides accessible menu behavior",
"authors": "The Polymer Authors", "authors": "The Polymer Authors",
"keywords": [ "keywords": [
@ -34,11 +34,11 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"_release": "1.1.7", "_release": "1.1.8",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.7", "tag": "v1.1.8",
"commit": "ea59e6ce5644d8f7a20c22f13f614ea60604a812" "commit": "3f6676b93a4592975efa235590b9d8236af6ea1d"
}, },
"_source": "git://github.com/polymerelements/iron-menu-behavior.git", "_source": "git://github.com/polymerelements/iron-menu-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,23 +1,23 @@
language: node_js language: node_js
sudo: required sudo: required
before_script: before_script:
- npm install -g bower polylint web-component-tester - npm install -g bower polylint web-component-tester
- bower install - bower install
- polylint - polylint
env: env:
global: global:
- secure: QxZD8yzz7s3F6b7h87ztWYiEbD2TrQp1Z1mib5u1wL7EAwsrQVkFhIEo4cJPAsTGS98qgeZAITg0ifwp/jOKVC2QKoPnC1qjm4L0AjlhXBTRbqyS5G8jvfJ8M4DgkQXADh4e+lw9ba3h2AxceJELKTYaQVq/cpTrpPg0/RH7H4o= - secure: CbYi/0VAtpLB+NDHdD/I9q2ldILrmyc3wxKdO5vEtMvRKYgsddQ/hXGovV3c6Hy9sAXD5sKtNi60BBG5E2XuydshjYAZiytfeNjFIvDu5627Xljjt90e/r1hg3tNHRRQihH73nPECfp/X+g+yBNCX3f0+2ExAh0DMs1DXt7Dl7Q=
- secure: i76J23Bpwj6qJ4ybCCsQpGCTT+5s1PA+x0Avjbl1JTS4OsJLDFfvVl0YIWZ5xMIKJtdPC/mGDoZ2LNrh9hz82DBqDnzBlSnNjFbjnU1Aqy5CUmRWzyAF5NOjJGotISZcDYDGZd6gjsOfN0r+rICyRUiOadeyPf0Nm+6HSVQMjfM= - secure: kLFlOTh9IjctY7DIJ3KEw5OPrqHNTzoArdabfAtisBMWahuJptKFmYCp/t+zPSL27IVqJakaqPrwGrBUi+4h3wVWredNhfl2lCpMfQfBMcHC5kBVkf2xjJyDa5Y3bP7jPq6YnWYAqEl6pBWYiHU6yWBc6BEdJ6FsTWFbLFTnY7w=
node_js: stable node_js: stable
addons: addons:
firefox: latest firefox: '46.0'
apt: apt:
sources: sources:
- google-chrome - google-chrome
packages: packages:
- google-chrome-stable - google-chrome-stable
sauce_connect: true sauce_connect: true
script: script:
- xvfb-run wct - xvfb-run wct
- "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi" - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s 'default'; fi
dist: trusty dist: trusty

View file

@ -1,4 +1,3 @@
<!-- <!--
This file is autogenerated based on This file is autogenerated based on
https://github.com/PolymerElements/ContributionGuide/blob/master/CONTRIBUTING.md https://github.com/PolymerElements/ContributionGuide/blob/master/CONTRIBUTING.md
@ -11,6 +10,7 @@ specific element:
jsbin=https://jsbin.com/cagaye/edit?html,output jsbin=https://jsbin.com/cagaye/edit?html,output
--> -->
# Polymer Elements # Polymer Elements
## Guide for Contributors ## Guide for Contributors

View file

@ -1,6 +1,6 @@
{ {
"name": "iron-menu-behavior", "name": "iron-menu-behavior",
"version": "1.1.7", "version": "1.1.8",
"description": "Provides accessible menu behavior", "description": "Provides accessible menu behavior",
"authors": "The Polymer Authors", "authors": "The Polymer Authors",
"keywords": [ "keywords": [

View file

@ -139,11 +139,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
/** /**
* Focuses the previous item (relative to the currently focused item) in the * Focuses the previous item (relative to the currently focused item) in the
* menu, disabled items will be skipped. * menu, disabled items will be skipped.
* Loop until length + 1 to handle case of single item in menu.
*/ */
_focusPrevious: function() { _focusPrevious: function() {
var length = this.items.length; var length = this.items.length;
var curFocusIndex = Number(this.indexOf(this.focusedItem)); var curFocusIndex = Number(this.indexOf(this.focusedItem));
for (var i = 1; i < length; i++) { for (var i = 1; i < length + 1; i++) {
var item = this.items[(curFocusIndex - i + length) % length]; var item = this.items[(curFocusIndex - i + length) % length];
if (!item.hasAttribute('disabled')) { if (!item.hasAttribute('disabled')) {
this._setFocusedItem(item); this._setFocusedItem(item);
@ -155,11 +156,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
/** /**
* Focuses the next item (relative to the currently focused item) in the * Focuses the next item (relative to the currently focused item) in the
* menu, disabled items will be skipped. * menu, disabled items will be skipped.
* Loop until length + 1 to handle case of single item in menu.
*/ */
_focusNext: function() { _focusNext: function() {
var length = this.items.length; var length = this.items.length;
var curFocusIndex = Number(this.indexOf(this.focusedItem)); var curFocusIndex = Number(this.indexOf(this.focusedItem));
for (var i = 1; i < length; i++) { for (var i = 1; i < length + 1; i++) {
var item = this.items[(curFocusIndex + i) % length]; var item = this.items[(curFocusIndex + i) % length];
if (!item.hasAttribute('disabled')) { if (!item.hasAttribute('disabled')) {
this._setFocusedItem(item); this._setFocusedItem(item);

View file

@ -36,6 +36,14 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
</template> </template>
</test-fixture> </test-fixture>
<test-fixture id="single-item">
<template>
<test-menu>
<div>item 1</div>
</test-menu>
</template>
</test-fixture>
<test-fixture id="disabled"> <test-fixture id="disabled">
<template> <template>
<test-menu> <test-menu>
@ -101,6 +109,17 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
}); });
}); });
test('first item gets focus when menu is focused in a single item menu', function(done) {
var menu = fixture('single-item');
MockInteractions.focus(menu);
Polymer.Base.async(function() {
var ownerRoot = Polymer.dom(menu.firstElementChild).getOwnerRoot() || document;
var activeElement = Polymer.dom(ownerRoot).activeElement;
assert.equal(activeElement, menu.firstElementChild, 'menu.firstElementChild is focused');
done();
});
});
test('selected item gets focus when menu is focused', function(done) { test('selected item gets focus when menu is focused', function(done) {
var menu = fixture('basic'); var menu = fixture('basic');
menu.selected = 1; menu.selected = 1;

View file

@ -39,6 +39,6 @@
"commit": "8715c83bf04a228de00ec662ed43eb6141e61b91" "commit": "8715c83bf04a228de00ec662ed43eb6141e61b91"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.2.0", "_target": "^1.1.0",
"_originalSource": "Polymer/polymer" "_originalSource": "Polymer/polymer"
} }