Skip to content

Commit

Permalink
Merge branch 'master' into 4458-kschaaf-basic-templatizer
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinpschaaf authored Jan 23, 2018
2 parents b52c315 + 4b58f54 commit 35865ea
Show file tree
Hide file tree
Showing 21 changed files with 288 additions and 229 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
If you are asking a question rather than filing a bug, try one of these instead:
- StackOverflow (http://stackoverflow.com/questions/tagged/polymer)
- StackOverflow (https://stackoverflow.com/questions/tagged/polymer)
- Polymer Slack Channel (https://bit.ly/polymerslack)
- Mailing List (https://groups.google.com/forum/#!forum/polymer-dev)
-->
Expand All @@ -10,7 +10,7 @@ If you are asking a question rather than filing a bug, try one of these instead:

#### Live Demo
<!-- Fork this JSBin, or provide your own URL -->
http://jsbin.com/luhaxab/1/edit
https://jsbin.com/luhaxab/1/edit

#### Steps to Reproduce
<!--
Expand Down
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
sudo: false
sudo: required
dist: trusty
node_js: stable
addons:
Expand All @@ -15,9 +15,8 @@ before_script:
- gulp update-types
- git diff --exit-code
script:
- xvfb-run wct -l chrome
- xvfb-run wct -l firefox
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s 'windows 10/microsoftedge@14' -s 'windows 10/microsoftedge@15' -s 'windows 8.1/internet explorer@11' -s 'os x 10.11/safari@9' -s 'macos 10.12/safari@10' -s 'macos 10.12/safari@11' -s 'Linux/chrome@41'; fi
- wct -l chrome -l firefox
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then travis_wait 30 ./util/travis-sauce-test.sh; fi
env:
global:
- secure: bfF/o1ewpOxDNqTzWfvlwgRgGfP8OXhSQLLdEwZ6izO9tckMJuSNghk3qBXCEQJwTcUEyXP6EqfzIrRAvDXPa0H3OoinbrooDyV2wIDaVRK++WR2iZIqzqo3hGOdzm4tdrGJZe5av5Rk661Hls8aPfLbjdzcGuYXi8B4wZq2xMI=
Expand Down
3 changes: 1 addition & 2 deletions lib/elements/dom-repeat.html
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@
this.__debounceRender(this.__render, this.delay);
} else if (this.__observePaths) {
// Otherwise, re-render if the path changed matches an observed path
path = path.substring(path.indexOf('.') + 1);
let paths = this.__observePaths;
for (let i=0; i<paths.length; i++) {
if (path.indexOf(paths[i]) === 0) {
Expand Down Expand Up @@ -558,7 +557,7 @@
let itemIdx = isntIdxToItemsIdx[instIdx];
let item = items[itemIdx];
itemsIdxToInstIdx[itemIdx] = instIdx;
if (inst && instIdx < this.__limit) {
if (inst) {
inst._setPendingProperty(this.as, item);
inst._setPendingProperty(this.indexAs, instIdx);
inst._setPendingProperty(this.itemsIndexAs, itemIdx);
Expand Down
2 changes: 1 addition & 1 deletion lib/legacy/class.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* the underlying element.
*
* @template T
* @param {!(PolymerInit|Array<!PolymerInit>)} behaviors Behavior object or array of behaviors.
* @param {!Object|!Array<!Object>} behaviors Behavior object or array of behaviors.
* @param {function(new:T)} klass Element class.
* @return {function(new:T)} Returns a new Element class extended by the
* passed in `behaviors` and also by `Polymer.LegacyElementMixin`.
Expand Down
2 changes: 1 addition & 1 deletion lib/legacy/legacy-element-mixin.html
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@
*/
_logger(level, args) {
// accept ['foo', 'bar'] and [['foo', 'bar']]
if (Array.isArray(args) && args.length === 1) {
if (Array.isArray(args) && args.length === 1 && Array.isArray(args[0])) {
args = args[0];
}
switch(level) {
Expand Down
2 changes: 1 addition & 1 deletion lib/legacy/polymer.dom.html
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
/**
* @function
* @param {string} selector
* @return {!NodeList}
* @return {!NodeList<!Element>}
*/
Polymer.DomApi.prototype.querySelectorAll;

Expand Down
2 changes: 1 addition & 1 deletion lib/utils/templatize.html
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
/**
* Returns an anonymous `Polymer.PropertyEffects` class bound to the
* `<template>` provided. Instancing the class will result in the
* template being stamped into document fragment stored as the instance's
* template being stamped into a document fragment stored as the instance's
* `root` property, after which it can be appended to the DOM.
*
* Templates may utilize all Polymer data-binding features as well as
Expand Down
Loading

0 comments on commit 35865ea

Please sign in to comment.