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

merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -1,6 +1,6 @@
{
"name": "iron-media-query",
"version": "1.0.3",
"version": "1.0.8",
"description": "Lets you bind to a CSS media query",
"authors": [
"The Polymer Authors"
@ -23,16 +23,17 @@
},
"devDependencies": {
"paper-styles": "polymerelements/paper-styles#^1.0.2",
"web-component-tester": "*",
"web-component-tester": "polymer/web-component-tester#^3.4.0",
"test-fixture": "PolymerElements/test-fixture#^1.0.0",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"_release": "1.0.3",
"main": "iron-media-query.html",
"_release": "1.0.8",
"_resolution": {
"type": "version",
"tag": "v1.0.3",
"commit": "80e921f58e7688a840a0cf29e9e2aaaee72a66b2"
"tag": "v1.0.8",
"commit": "3f916be171af7a3e03eb019acdfea71055d3c744"
},
"_source": "git://github.com/PolymerElements/iron-media-query.git",
"_target": "^1.0.0",

View file

@ -0,0 +1,22 @@
language: node_js
sudo: false
before_script:
- npm install web-component-tester
- npm install bower
- 'export PATH=$PWD/node_modules/.bin:$PATH'
- bower install
env:
global:
- secure: My9uxlkp4fZwSHKqo1RUv4yBhNl46XfbaiOsOStqJdI9l7hBfudSl7V2OZeLuV2pEDJC1z1ZqVU6C/K0/iTf7i66cd9g0iH5N+1qex8p2AcuP1evPWbwLw8moHH+M5E14MMXD8sPX4KauS8azmgRm61pppD5ZgKfCaeGZg7Tczs=
- secure: LgnZP4BNGBkTZhf8Vr7r9LdrOwq2/58TqqYkFFloEGBRT6HmumNSRwNbIwOh1U9jSTVkqjC2rn4G27u4XlEIs+QTD2PVSSEKy7Vbn0KxSNCvCGaOB1ZaxWTwZa7nkg09ZFRCHGh+WIbuV+BxyzsjOqlN82GSzFNSb3rxhqDM6dU=
node_js: 4
addons:
firefox: latest
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
script:
- xvfb-run wct
- "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"

View file

@ -0,0 +1,72 @@
<!--
This file is autogenerated based on
https://github.com/PolymerElements/ContributionGuide/blob/master/CONTRIBUTING.md
If you edit that file, it will get updated everywhere else.
If you edit this file, your changes will get overridden :)
-->
# Polymer Elements
## Guide for Contributors
Polymer Elements are built in the open, and the Polymer authors eagerly encourage any and all forms of community contribution. When contributing, please follow these guidelines:
### Filing Issues
**If you are filing an issue to request a feature**, please provide a clear description of the feature. It can be helpful to describe answers to the following questions:
1. **Who will use the feature?** _“As someone filling out a form…”_
2. **When will they use the feature?** _“When I enter an invalid value…”_
3. **What is the users goal?** _“I want to be visually notified that the value needs to be corrected…”_
**If you are filing an issue to report a bug**, please provide:
1. **A clear description of the bug and related expectations.** Consider using the following example template for reporting a bug:
```markdown
The `paper-foo` element causes the page to turn pink when clicked.
## Expected outcome
The page stays the same color.
## Actual outcome
The page turns pink.
## Steps to reproduce
1. Put a `paper-foo` element in the page.
2. Open the page in a web browser.
3. Click the `paper-foo` element.
```
2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [http://jsbin.com/cagaye](http://jsbin.com/cagaye/edit?html,output).
3. **A list of browsers where the problem occurs.** This can be skipped if the problem is the same across all browsers.
### Submitting Pull Requests
**Before creating a pull request**, please ensure that an issue exists for the corresponding change in the pull request that you intend to make. **If an issue does not exist, please create one per the guidelines above**. The goal is to discuss the design and necessity of the proposed change with Polymer authors and community before diving into a pull request.
When submitting pull requests, please provide:
1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues using the following syntax:
```markdown
(For a single issue)
Fixes #20
(For multiple issues)
Fixes #32, #40
```
2. **A succinct description of the design** used to fix any related issues. For example:
```markdown
This fixes #20 by removing styles that leaked which would cause the page to turn pink whenever `paper-foo` is clicked.
```
3. **At least one test for each bug fixed or feature added** as part of the pull request. Pull requests that fix bugs or add features without accompanying tests will not be considered.
If a proposed change contains multiple commits, please [squash commits](https://www.google.com/url?q=http://blog.steveklabnik.com/posts/2012-11-08-how-to-squash-commits-in-a-github-pull-request) to as few as is necessary to succinctly express the change. A Polymer author can help you squash commits, so dont be afraid to ask us if you need help with that!

View file

@ -1,6 +1,6 @@
{
"name": "iron-media-query",
"version": "1.0.3",
"version": "1.0.8",
"description": "Lets you bind to a CSS media query",
"authors": [
"The Polymer Authors"
@ -23,9 +23,10 @@
},
"devDependencies": {
"paper-styles": "polymerelements/paper-styles#^1.0.2",
"web-component-tester": "*",
"web-component-tester": "polymer/web-component-tester#^3.4.0",
"test-fixture": "PolymerElements/test-fixture#^1.0.0",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}
},
"main": "iron-media-query.html"
}

View file

@ -17,8 +17,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../../paper-styles/paper-styles.html">
<link rel="import" href="../../paper-styles/demo-pages.html">
<link rel="import" href="../iron-media-query.html">
@ -29,17 +27,67 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<h1>&lt;iron-media-query&gt;</h1>
<template is="dom-bind">
<iron-media-query query="(min-width: 600px)" query-matches="{{queryMatches}}"></iron-media-query>
<style>
.item {
margin: 8px;
border: 1px solid #ddd;
}
<template is="dom-if" if="{{queryMatches}}">
<p>The viewports width is greater than <code>600px</code></p>
</template>
.item .title {
font-weight: bold;
font-size: 1.2em;
background-color: #eee;
padding: 8px;
}
<template is="dom-if" if="{{!queryMatches}}">
<p>The viewports width is less than <code>600px</code></p>
</template>
.item[wide-layout] .title {
float: left;
margin: 0 8px 4px 0;
font-size: 1.4em;
}
.item .description {
padding: 8px;
}
.item::after {
content: '';
display: block;
clear: both;
}
</style>
<iron-media-query query="(min-width: 600px)" query-matches="{{wide}}"></iron-media-query>
<iron-media-query full query="print" query-matches="{{print}}"></iron-media-query>
<div class="item" wide-layout$="{{wide}}">
<div class="title">Resize the window</div>
<div class="description">
<template is="dom-if" if="{{!wide}}">
The viewport is less than 600px wide, so the items' titles will
not float.
</template>
<template is="dom-if" if="{{wide}}">
The viewport is at least 600px, so the items' titles will float
to the left.
</template>
Here's another sentence; it's not very long.
</div>
</div>
<div class="item" wide-layout$="{{wide}}">
<div class="title"><code>print</code> example</div>
<div class="description">
<a href="http://polymer-project.org">
This link's destination is visible when this page is printed.
</a>
<template is="dom-if" if="{{print}}">
(http://polymer-project.org)
</template>
This is another sentence which is meant to help fill this box.
</div>
</div>
</template>
</div>
</div>
</body>
</html>

View file

@ -1,11 +1,11 @@
<!doctype html>
<!--
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
The complete set of authors may be found at http://polymer.github.io/AUTHORS
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<html>
<head>

View file

@ -50,14 +50,34 @@ Example:
observer: 'queryChanged'
},
/**
* If true, the query attribute is assumed to be a complete media query
* string rather than a single media feature.
*/
full: {
type: Boolean,
value: false
},
/**
* @type {function(MediaQueryList)}
*/
_boundMQHandler: {
value: function() {
return this.queryHandler.bind(this);
}
},
/**
* @type {MediaQueryList}
*/
_mq: {
value: null
}
},
attached: function() {
this.style.display = 'none';
this.queryChanged();
},
@ -84,7 +104,7 @@ Example:
if (!query) {
return;
}
if (query[0] !== '(') {
if (!this.full && query[0] !== '(') {
query = '(' + query + ')';
}
this._mq = window.matchMedia(query);

View file

@ -17,11 +17,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<script src="../../test-fixture/test-fixture-mocha.js"></script>
<link rel="import" href="../iron-media-query.html">
<link rel="import" href="../../test-fixture/test-fixture.html">
</head>
<body>
@ -66,6 +63,20 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
assert.equal(mq.queryMatches, true);
});
suite('`full` attribute', function() {
test('media features without wrapping parentheses no longer match', function() {
mq.full = true;
mq.query = 'min-width: 1px';
assert.equal(mq.queryMatches, false);
});
test('media queries with both types and features match', function() {
mq.full = true;
mq.query = 'all and (min-width: 1px)';
assert.equal(mq.queryMatches, true);
});
});
suite('query does not activate on empty string or null', function() {
test('empty string', function() {

View file

@ -1,15 +1,11 @@
<!doctype html>
<!--
<!DOCTYPE html><!--
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<html>
<head>
--><html><head>
<meta charset="utf-8">
<title>Tests</title>
@ -19,12 +15,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<body>
<script>
WCT.loadSuites([
'basic.html'
'basic.html',
'basic.html?dom=shadow'
]);
</script>
</body>
</html>
</body></html>