GreenPolyProducts/polymer
5
0
Fork 0
mirror of https://github.com/Polymer/polymer.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into double-properties-invocation

Browse Source
This commit is contained in:
Tim van der Lippe
2018-08-02 11:22:34 +02:00
parent 63c7fc0026 0bf1e60c15
commit 9576bef4d9
42 changed files with 7103 additions and 8273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/unit/shady-content.html
View File

@@ -12,10 +12,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<head>
<meta charset="utf-8">
<script>
if (!window.customElements) {
window.customElements = {};
if (window.customElements) {
customElements.forcePolyfill = true;
}
customElements.forcePolyfill = true;
window.ShadyDOM = {
force: true
};

5
test/unit/shady-dynamic.html
View File

@@ -12,10 +12,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<head>
<meta charset="utf-8">
<script>
if (!window.customElements) {
window.customElements = {};
if (window.customElements) {
customElements.forcePolyfill = true;
}
customElements.forcePolyfill = true;
window.ShadyDOM = {
force: true
};

5
test/unit/shady-events.html
View File

@@ -11,10 +11,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<html>
<head>
<script>
if (!window.customElements) {
window.customElements = {};
if (window.customElements) {
customElements.forcePolyfill = true;
}
customElements.forcePolyfill = true;
window.ShadyDOM = {
force: true
};

3
test/unit/shady.html
View File

@@ -456,7 +456,8 @@ function getEffectiveChildNodes(node) {
}
function getComposedHTML(node) {
return ShadyDOM.nativeTree.innerHTML(node);
// Ignore shady CSS scoping
return ShadyDOM.nativeTree.innerHTML(node).replace(/ class="[^"]*"/g, '');
}
function getComposedChildAtIndex(node, index) {

2
test/unit/styling-cross-scope-var.html
View File

@@ -769,7 +769,7 @@ test('variables in @keyframes', function(done) {
});
test('instances of scoped @keyframes', function(done) {
if (navigator.userAgent.match(/Safari\/60(3|4)/) && ShadyCSS.nativeCss && ShadyCSS.nativeShadow) {
if (navigator.userAgent.match(/Safari/) && ShadyCSS.nativeCss && ShadyCSS.nativeShadow) {
// `:nth-of-type` is broken in shadow roots on Safari 10.1
// https://bugs.webkit.org/show_bug.cgi?id=166748
this.skip();