mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update polymer
This commit is contained in:
parent
15b68f5f4b
commit
2ffd85b8d0
14 changed files with 150 additions and 36 deletions
|
@ -39,6 +39,6 @@
|
||||||
"commit": "cec8e49744a1e18b14a711eea77e201bb70de544"
|
"commit": "cec8e49744a1e18b14a711eea77e201bb70de544"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/desandro/doc-ready.git",
|
"_source": "git://github.com/desandro/doc-ready.git",
|
||||||
"_target": "~1.0.4",
|
"_target": "1.0.x",
|
||||||
"_originalSource": "doc-ready"
|
"_originalSource": "doc-ready"
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "paper-item",
|
"name": "paper-item",
|
||||||
"version": "1.0.5",
|
"version": "1.0.6",
|
||||||
"description": "A material-design styled list item",
|
"description": "A material-design styled list item",
|
||||||
"authors": [
|
"authors": [
|
||||||
"The Polymer Authors"
|
"The Polymer Authors"
|
||||||
|
@ -39,11 +39,11 @@
|
||||||
"web-component-tester": "Polymer/web-component-tester#^3.3.0",
|
"web-component-tester": "Polymer/web-component-tester#^3.3.0",
|
||||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
||||||
},
|
},
|
||||||
"_release": "1.0.5",
|
"_release": "1.0.6",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.0.5",
|
"tag": "v1.0.6",
|
||||||
"commit": "a292fb913d0e9f1e7b9bb46d2af60dc8c7a05dc3"
|
"commit": "803078d9942d1279fb6f4142b7522186d57f17c8"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/PolymerElements/paper-item.git",
|
"_source": "git://github.com/PolymerElements/paper-item.git",
|
||||||
"_target": "~1.0.2",
|
"_target": "~1.0.2",
|
||||||
|
|
28
dashboard-ui/bower_components/paper-item/.travis.yml
vendored
Normal file
28
dashboard-ui/bower_components/paper-item/.travis.yml
vendored
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
language: node_js
|
||||||
|
sudo: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- node_js: stable
|
||||||
|
script: xvfb-run wct
|
||||||
|
addons:
|
||||||
|
firefox: latest
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- google-chrome
|
||||||
|
packages:
|
||||||
|
- google-chrome-stable
|
||||||
|
- node_js: node
|
||||||
|
script:
|
||||||
|
- |
|
||||||
|
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
|
||||||
|
wct -s 'default'
|
||||||
|
fi
|
||||||
|
before_script:
|
||||||
|
- npm install web-component-tester
|
||||||
|
- npm install bower
|
||||||
|
- export PATH=$PWD/node_modules/.bin:$PATH
|
||||||
|
- bower install
|
||||||
|
env:
|
||||||
|
global:
|
||||||
|
- secure: NCk3KK+wbaXMzp8XAY6FeL+TSdI0AlPI3/tl0OpsUIaU2EiCjQuzf/UpyzCW5XZMEVFF4q/eDjrPkqJodHfpngj36mpkfmfqj9DrgDmYsV9BDvsTd8KmLsA6H8D6p7Qer+r1JMMB8PvX44vdhQ6GhZD1HFNYK1Ekpt0TkYwWKNw=
|
||||||
|
- secure: TGgUEQe6FJS+GuYk94d//8YQmDLUu0ekMvPSIs8TQ2QkdBK4SL+2bSXZt44BbDEOwc9P4NCPSUx/RMiCAqsc5OGRJImzb/zqPNIDTeKG6q72HPBBBD3Sk0CrEpTQbOK/Flaa/B7RYR0U1kuljSmRS7lPG19nnY8gOHnIAgwIyk0=
|
72
dashboard-ui/bower_components/paper-item/CONTRIBUTING.md
vendored
Normal file
72
dashboard-ui/bower_components/paper-item/CONTRIBUTING.md
vendored
Normal 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 user’s 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 don’t be afraid to ask us if you need help with that!
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "paper-item",
|
"name": "paper-item",
|
||||||
"version": "1.0.5",
|
"version": "1.0.6",
|
||||||
"description": "A material-design styled list item",
|
"description": "A material-design styled list item",
|
||||||
"authors": [
|
"authors": [
|
||||||
"The Polymer Authors"
|
"The Polymer Authors"
|
||||||
|
|
|
@ -78,7 +78,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
<div class="layout wrap inline center-center">
|
<div class="layout wrap inline center-center">
|
||||||
<div>
|
<div>
|
||||||
<h4>Single line items</h4>
|
<h4>Single line items</h4>
|
||||||
<div class="list short" role="list">
|
<div class="list short" role="listbox">
|
||||||
<paper-item>Inbox</paper-item>
|
<paper-item>Inbox</paper-item>
|
||||||
<paper-item>Starred</paper-item>
|
<paper-item>Starred</paper-item>
|
||||||
<paper-item>Sent mail</paper-item>
|
<paper-item>Sent mail</paper-item>
|
||||||
|
@ -88,7 +88,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4>Icon with text</h4>
|
<h4>Icon with text</h4>
|
||||||
<div class="list short" role="list">
|
<div class="list short" role="listbox">
|
||||||
<paper-icon-item>
|
<paper-icon-item>
|
||||||
<iron-icon icon="inbox" item-icon></iron-icon> Inbox
|
<iron-icon icon="inbox" item-icon></iron-icon> Inbox
|
||||||
</paper-icon-item>
|
</paper-icon-item>
|
||||||
|
@ -106,7 +106,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4>Avatar with text</h4>
|
<h4>Avatar with text</h4>
|
||||||
<div class="list short" role="list">
|
<div class="list short" role="listbox">
|
||||||
<paper-icon-item>
|
<paper-icon-item>
|
||||||
<div class="avatar blue" item-icon></div> Alphonso Engelking
|
<div class="avatar blue" item-icon></div> Alphonso Engelking
|
||||||
</paper-icon-item>
|
</paper-icon-item>
|
||||||
|
@ -124,7 +124,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4>Avatar with text and icon</h4>
|
<h4>Avatar with text and icon</h4>
|
||||||
<div class="list short" role="list">
|
<div class="list short" role="listbox">
|
||||||
<paper-icon-item>
|
<paper-icon-item>
|
||||||
<div class="avatar red" item-icon></div>
|
<div class="avatar red" item-icon></div>
|
||||||
<div class="flex">Alphonso</div>
|
<div class="flex">Alphonso</div>
|
||||||
|
@ -150,7 +150,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4>Avatar with text and control</h4>
|
<h4>Avatar with text and control</h4>
|
||||||
<div class="list short" role="list">
|
<div class="list short" role="listbox">
|
||||||
<paper-icon-item>
|
<paper-icon-item>
|
||||||
<div class="avatar orange" item-icon></div>
|
<div class="avatar orange" item-icon></div>
|
||||||
<div class="flex">Alphonso</div>
|
<div class="flex">Alphonso</div>
|
||||||
|
@ -176,7 +176,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4>Control with text and icon</h4>
|
<h4>Control with text and icon</h4>
|
||||||
<div class="list short" role="list">
|
<div class="list short" role="listbox">
|
||||||
<paper-icon-item>
|
<paper-icon-item>
|
||||||
<paper-checkbox item-icon></paper-checkbox>
|
<paper-checkbox item-icon></paper-checkbox>
|
||||||
<div class="flex">Alphonso</div>
|
<div class="flex">Alphonso</div>
|
||||||
|
@ -202,7 +202,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4>Two-line items</h4>
|
<h4>Two-line items</h4>
|
||||||
<div class="list" role="list">
|
<div class="list" role="listbox">
|
||||||
<paper-item>
|
<paper-item>
|
||||||
<paper-item-body two-line class="layout vertical">
|
<paper-item-body two-line class="layout vertical">
|
||||||
<div>Profile Photo</div>
|
<div>Profile Photo</div>
|
||||||
|
@ -226,7 +226,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4>Icon with two-line text</h4>
|
<h4>Icon with two-line text</h4>
|
||||||
<div class="list" role="list">
|
<div class="list" role="listbox">
|
||||||
<paper-icon-item>
|
<paper-icon-item>
|
||||||
<div class="avatar green" item-icon></div>
|
<div class="avatar green" item-icon></div>
|
||||||
<paper-item-body two-line>
|
<paper-item-body two-line>
|
||||||
|
@ -254,7 +254,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4>Avatar with text and icon</h4>
|
<h4>Avatar with text and icon</h4>
|
||||||
<div class="list" role="list">
|
<div class="list" role="listbox">
|
||||||
<paper-icon-item>
|
<paper-icon-item>
|
||||||
<div class="avatar blue" item-icon></div>
|
<div class="avatar blue" item-icon></div>
|
||||||
<paper-item-body two-line>
|
<paper-item-body two-line>
|
||||||
|
|
|
@ -75,7 +75,7 @@ Custom property | Description |
|
||||||
is: 'paper-icon-item',
|
is: 'paper-icon-item',
|
||||||
|
|
||||||
hostAttributes: {
|
hostAttributes: {
|
||||||
'role': 'listitem',
|
'role': 'option',
|
||||||
'tabindex': '0'
|
'tabindex': '0'
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ This element has `role="listitem"` by default. Depending on usage, it may be mor
|
||||||
is: 'paper-item',
|
is: 'paper-item',
|
||||||
|
|
||||||
hostAttributes: {
|
hostAttributes: {
|
||||||
role: 'listitem',
|
role: 'option',
|
||||||
tabindex: '0'
|
tabindex: '0'
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<test-fixture id="item">
|
<test-fixture id="item">
|
||||||
<template>
|
<template>
|
||||||
<div role="list">
|
<div role="listbox">
|
||||||
<paper-item>item</paper-item>
|
<paper-item>item</paper-item>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -39,7 +39,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
<test-fixture id="iconItem">
|
<test-fixture id="iconItem">
|
||||||
<template>
|
<template>
|
||||||
<div role="list">
|
<div role="listbox">
|
||||||
<paper-icon-item>item</paper-icon-item>
|
<paper-icon-item>item</paper-icon-item>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -56,11 +56,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
});
|
});
|
||||||
|
|
||||||
test('item has role="listitem"', function() {
|
test('item has role="listitem"', function() {
|
||||||
assert.equal(item.getAttribute('role'), 'listitem', 'has role="item"');
|
assert.equal(item.getAttribute('role'), 'option', 'has role="option"');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('icon item has role="listitem"', function() {
|
test('icon item has role="listitem"', function() {
|
||||||
assert.equal(iconItem.getAttribute('role'), 'listitem', 'has role="item"');
|
assert.equal(iconItem.getAttribute('role'), 'option', 'has role="option"');
|
||||||
});
|
});
|
||||||
|
|
||||||
a11ySuite('item');
|
a11ySuite('item');
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "polymer",
|
"name": "polymer",
|
||||||
"version": "1.2.0",
|
"version": "1.2.1",
|
||||||
"main": [
|
"main": [
|
||||||
"polymer.html"
|
"polymer.html"
|
||||||
],
|
],
|
||||||
|
@ -25,11 +25,11 @@
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"homepage": "https://github.com/Polymer/polymer",
|
"homepage": "https://github.com/Polymer/polymer",
|
||||||
"_release": "1.2.0",
|
"_release": "1.2.1",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.2.0",
|
"tag": "v1.2.1",
|
||||||
"commit": "84d211624cffd04d6894ec90713c2029732e8bb5"
|
"commit": "be2d57a329244735ca7aac34ac56c96b6270ae79"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/Polymer/polymer.git",
|
"_source": "git://github.com/Polymer/polymer.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "polymer",
|
"name": "polymer",
|
||||||
"version": "1.2.0",
|
"version": "1.2.1",
|
||||||
"main": [
|
"main": [
|
||||||
"polymer.html"
|
"polymer.html"
|
||||||
],
|
],
|
||||||
|
|
|
@ -576,7 +576,7 @@ debouncer.stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
Polymer.version = '1.2.0';
|
Polymer.version = '1.2.1';
|
||||||
Polymer.Base._addFeature({
|
Polymer.Base._addFeature({
|
||||||
_registerFeatures: function () {
|
_registerFeatures: function () {
|
||||||
this._prepIs();
|
this._prepIs();
|
||||||
|
|
|
@ -395,6 +395,17 @@ DomApi.prototype = {
|
||||||
flush: function () {
|
flush: function () {
|
||||||
Polymer.dom.flush();
|
Polymer.dom.flush();
|
||||||
},
|
},
|
||||||
|
deepContains: function (node) {
|
||||||
|
if (this.node.contains(node)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
var n = node;
|
||||||
|
var wrappedDocument = wrap(document);
|
||||||
|
while (n && n !== wrappedDocument && n !== this.node) {
|
||||||
|
n = Polymer.dom(n).parentNode || n.host;
|
||||||
|
}
|
||||||
|
return n === this.node;
|
||||||
|
},
|
||||||
_lazyDistribute: function (host) {
|
_lazyDistribute: function (host) {
|
||||||
if (host.shadyRoot && host.shadyRoot._distributionClean) {
|
if (host.shadyRoot && host.shadyRoot._distributionClean) {
|
||||||
host.shadyRoot._distributionClean = false;
|
host.shadyRoot._distributionClean = false;
|
||||||
|
|
|
@ -720,7 +720,7 @@ prevent = dy > dx;
|
||||||
prevent = dx > dy;
|
prevent = dx > dy;
|
||||||
}
|
}
|
||||||
if (prevent) {
|
if (prevent) {
|
||||||
//ev.preventDefault();
|
ev.preventDefault();
|
||||||
} else {
|
} else {
|
||||||
Gestures.prevent('track');
|
Gestures.prevent('track');
|
||||||
}
|
}
|
||||||
|
@ -1359,7 +1359,7 @@ elt[n] = props[n];
|
||||||
return elt;
|
return elt;
|
||||||
},
|
},
|
||||||
isLightDescendant: function (node) {
|
isLightDescendant: function (node) {
|
||||||
return this.contains(node) && Polymer.dom(this).getOwnerRoot() === Polymer.dom(node).getOwnerRoot();
|
return this !== node && this.contains(node) && Polymer.dom(this).getOwnerRoot() === Polymer.dom(node).getOwnerRoot();
|
||||||
},
|
},
|
||||||
isLocalDescendant: function (node) {
|
isLocalDescendant: function (node) {
|
||||||
return this.root === Polymer.dom(node).getOwnerRoot();
|
return this.root === Polymer.dom(node).getOwnerRoot();
|
||||||
|
@ -1957,7 +1957,7 @@ this._handlers = [];
|
||||||
Polymer.Base._addFeature({
|
Polymer.Base._addFeature({
|
||||||
notifyPath: function (path, value, fromAbove) {
|
notifyPath: function (path, value, fromAbove) {
|
||||||
var info = {};
|
var info = {};
|
||||||
path = this._get(path, this, info);
|
this._get(path, this, info);
|
||||||
this._notifyPath(info.path, value, fromAbove);
|
this._notifyPath(info.path, value, fromAbove);
|
||||||
},
|
},
|
||||||
_notifyPath: function (path, value, fromAbove) {
|
_notifyPath: function (path, value, fromAbove) {
|
||||||
|
@ -2074,9 +2074,9 @@ if (effect.value === path || effect.value.indexOf(path + '.') === 0) {
|
||||||
Polymer.Bind._annotationEffect.call(this, path, value, effect);
|
Polymer.Bind._annotationEffect.call(this, path, value, effect);
|
||||||
} else if (path.indexOf(effect.value + '.') === 0 && !effect.negate) {
|
} else if (path.indexOf(effect.value + '.') === 0 && !effect.negate) {
|
||||||
var node = this._nodes[effect.index];
|
var node = this._nodes[effect.index];
|
||||||
if (node && node.notifyPath) {
|
if (node && node._notifyPath) {
|
||||||
var p = this._fixPath(effect.name, effect.value, path);
|
var p = this._fixPath(effect.name, effect.value, path);
|
||||||
node.notifyPath(p, value, true);
|
node._notifyPath(p, value, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -2116,9 +2116,9 @@ _notifyBoundPaths: function (path, value) {
|
||||||
for (var a in this._boundPaths) {
|
for (var a in this._boundPaths) {
|
||||||
var b = this._boundPaths[a];
|
var b = this._boundPaths[a];
|
||||||
if (path.indexOf(a + '.') == 0) {
|
if (path.indexOf(a + '.') == 0) {
|
||||||
this.notifyPath(this._fixPath(b, a, path), value);
|
this._notifyPath(this._fixPath(b, a, path), value);
|
||||||
} else if (path.indexOf(b + '.') == 0) {
|
} else if (path.indexOf(b + '.') == 0) {
|
||||||
this.notifyPath(this._fixPath(a, b, path), value);
|
this._notifyPath(this._fixPath(a, b, path), value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -2386,7 +2386,7 @@ _rx: {
|
||||||
comments: /\/\*[^*]*\*+([^\/*][^*]*\*+)*\//gim,
|
comments: /\/\*[^*]*\*+([^\/*][^*]*\*+)*\//gim,
|
||||||
port: /@import[^;]*;/gim,
|
port: /@import[^;]*;/gim,
|
||||||
customProp: /(?:^|[\s;])--[^;{]*?:[^{};]*?(?:[;\n]|$)/gim,
|
customProp: /(?:^|[\s;])--[^;{]*?:[^{};]*?(?:[;\n]|$)/gim,
|
||||||
mixinProp: /(?:^|[\s;])--[^;{]*?:[^{;]*?{[^}]*?}(?:[;\n]|$)?/gim,
|
mixinProp: /(?:^|[\s;])?--[^;{]*?:[^{;]*?{[^}]*?}(?:[;\n]|$)?/gim,
|
||||||
mixinApply: /@apply[\s]*\([^)]*?\)[\s]*(?:[;\n]|$)?/gim,
|
mixinApply: /@apply[\s]*\([^)]*?\)[\s]*(?:[;\n]|$)?/gim,
|
||||||
varApply: /[^;:]*?:[^;]*var[^;]*(?:[;\n]|$)?/gim,
|
varApply: /[^;:]*?:[^;]*var[^;]*(?:[;\n]|$)?/gim,
|
||||||
keyframesRule: /^@[^\s]*keyframes/
|
keyframesRule: /^@[^\s]*keyframes/
|
||||||
|
@ -3089,7 +3089,7 @@ props[i] = v;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
rx: {
|
rx: {
|
||||||
VAR_ASSIGN: /(?:^|[;\n]\s*)(--[\w-]*?):\s*(?:([^;{]*)|{([^}]*)})(?:(?=[;\n])|$)/gi,
|
VAR_ASSIGN: /(?:^|[;\s{]\s*)(--[\w-]*?)\s*:\s*(?:([^;{]*)|{([^}]*)})(?:(?=[;\s}])|$)/gi,
|
||||||
MIXIN_MATCH: /(?:^|\W+)@apply[\s]*\(([^)]*)\)/i,
|
MIXIN_MATCH: /(?:^|\W+)@apply[\s]*\(([^)]*)\)/i,
|
||||||
VAR_MATCH: /(^|\W+)var\([\s]*([^,)]*)[\s]*,?[\s]*((?:[^,)]*)|(?:[^;]*\([^;)]*\)))[\s]*?\)/gi,
|
VAR_MATCH: /(^|\W+)var\([\s]*([^,)]*)[\s]*,?[\s]*((?:[^,)]*)|(?:[^;]*\([^;)]*\)))[\s]*?\)/gi,
|
||||||
VAR_CAPTURE: /\([\s]*(--[^,\s)]*)(?:,[\s]*(--[^,\s)]*))?(?:\)|,)/gi,
|
VAR_CAPTURE: /\([\s]*(--[^,\s)]*)(?:,[\s]*(--[^,\s)]*))?(?:\)|,)/gi,
|
||||||
|
@ -3624,9 +3624,12 @@ _pathEffectorImpl: function (path, value, fromAbove) {
|
||||||
if (this._forwardParentPath) {
|
if (this._forwardParentPath) {
|
||||||
if (path.indexOf(this._parentPropPrefix) === 0) {
|
if (path.indexOf(this._parentPropPrefix) === 0) {
|
||||||
var subPath = path.substring(this._parentPropPrefix.length);
|
var subPath = path.substring(this._parentPropPrefix.length);
|
||||||
|
var model = this._modelForPath(subPath);
|
||||||
|
if (model in this._parentProps) {
|
||||||
this._forwardParentPath(subPath, value);
|
this._forwardParentPath(subPath, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
Polymer.Base._pathEffector.call(this._templatized, path, value, fromAbove);
|
Polymer.Base._pathEffector.call(this._templatized, path, value, fromAbove);
|
||||||
},
|
},
|
||||||
_constructorImpl: function (model, host) {
|
_constructorImpl: function (model, host) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue