Merge branch 'master' into style-fixes

.eslintignore

@@ -0,0 +1,5 @@
+node_modules/*
+bower_components/*
+test/*
+src/**/demo/*
+src/**/experimental/*

.eslintrc.json

@@ -0,0 +1,17 @@
+{
+  "extends": "eslint:recommended",
+  "rules": {
+    "no-console": 0
+  },
+  "env": {
+    "browser": true
+  },
+  "plugins": [
+    "html"
+  ],
+  "globals": {
+    "CustomElements": true,
+    "HTMLImports": true,
+    "Polymer": true
+  }
+}

.travis.yml

@@ -15,6 +15,7 @@ before_script:
 - npm install -g bower
 - bower install
 script:
+- gulp lint
 - xvfb-run wct
 - "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
 env:

gulpfile.js

@@ -20,6 +20,7 @@ var runseq = require('run-sequence');
 var lazypipe = require('lazypipe');
 var polyclean = require('polyclean');
 var del = require('del');
+var eslint = require('gulp-eslint');
 
 var path = require('path');
 
@@ -124,3 +125,10 @@ gulp.task('audit', function() {
 gulp.task('release', function(cb) {
   runseq('default', ['copy-bower-json', 'audit'], cb);
 });
+
+gulp.task('lint', function() {
+  return gulp.src('src/**/*.html')
+    .pipe(eslint())
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError());
+});

package.json

@@ -9,8 +9,10 @@
   },
   "devDependencies": {
     "del": "^1.1.1",
+    "eslint-plugin-html": "^1.3.0",
     "gulp": "^3.8.11",
     "gulp-audit": "^1.0.0",
+    "gulp-eslint": "^1.1.1",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.5.3",
     "gulp-vulcanize": "^6.0.1",
@@ -21,7 +23,7 @@
   },
   "scripts": {
     "build": "gulp",
-    "test": "wct",
+    "test": "gulp lint && wct",
     "test-build": "gulp switch && wct && gulp restore"
   },
   "repository": {

src/lib/annotations/annotations.html

@@ -312,7 +312,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           });
         }
         // bindings (other attributes)
-        else if (b = this._parseNodeAttributeAnnotation(node, n, v)) {
+        else if ((b = this._parseNodeAttributeAnnotation(node, n, v))) {
           annotation.bindings.push(b);
         }
         // static id

src/lib/array-splice.html

@@ -56,8 +56,8 @@ Polymer.ArraySplice = (function() {
       for (var j = 0; j < columnCount; j++)
         distances[0][j] = j;
 
-      for (var i = 1; i < rowCount; i++) {
+      for (i = 1; i < rowCount; i++) {
-        for (var j = 1; j < columnCount; j++) {
+        for (j = 1; j < columnCount; j++) {
           if (this.equals(current[currentStart + j - 1], old[oldStart + i - 1]))
             distances[i][j] = distances[i - 1][j - 1];
           else {
@@ -181,7 +181,7 @@ Polymer.ArraySplice = (function() {
           this.calcEditDistances(current, currentStart, currentEnd,
                                  old, oldStart, oldEnd));
 
-      var splice = undefined;
+      splice = undefined;
       var splices = [];
       var index = currentStart;
       var oldIndex = oldStart;

src/lib/bind/accessors.html

@@ -256,7 +256,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         //if (node._prepParentProperties || !node._propertyInfo || (p && p.notify)) {
           this._addNotifyListener(node, inst, info.event, info.changedFn);
         //}
-      };
+      }
     },
 
     // TODO(sorvell): note, adding these synchronously may impact performance,

src/lib/collection.html

@@ -50,7 +50,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     },
 
     removeKey: function(key) {
-      if (key = this._parseKey(key)) {
+      if ((key = this._parseKey(key))) {
         this._removeFromMap(this.store[key]);
         delete this.store[key];
       }
@@ -95,7 +95,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     },
 
     setItem: function(key, item) {
-      if (key = this._parseKey(key)) {
+      if ((key = this._parseKey(key))) {
         var old = this.store[key];
         if (old) {
           this._removeFromMap(old);
@@ -110,7 +110,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     },
 
     getItem: function(key) {
-      if (key = this._parseKey(key)) {
+      if ((key = this._parseKey(key))) {
         return this.store[key];
       }
     },
@@ -140,7 +140,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           key = this.getKey(s.removed[j]);
           keyMap[key] = keyMap[key] ? null : -1;
         }
-        for (var j=0; j<s.addedCount; j++) {
+        for (j=0; j<s.addedCount; j++) {
           var item = this.userArray[s.index + j];
           key = this.getKey(item);
           key = (key === undefined) ? this.add(item) : key;
@@ -154,7 +154,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       // Convert added/removed key map to added/removed arrays
       var removed = [];
       var added = [];
-      for (var key in keyMap) {
+      for (key in keyMap) {
         if (keyMap[key] < 0) {
           this.removeKey(key);
           removed.push(key);

src/lib/custom-style.html

@@ -71,7 +71,6 @@ Note, all features of `custom-style` are available when defining styles as part
 <script>
 (function() {
 
-  var nativeShadow = Polymer.Settings.useNativeShadow;
   var propertyUtils = Polymer.StyleProperties;
   var styleUtil = Polymer.StyleUtil;
   var cssParse = Polymer.CssParse;

src/lib/dom-api-effective-nodes-observer.html

@@ -14,7 +14,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
     var DomApi = Polymer.DomApi.ctor;
     var Settings = Polymer.Settings;
-    var hasDomApi = Polymer.DomApi.hasDomApi;
 
     /**
      * DomApi.EffectiveNodesObserver tracks changes to an element's
@@ -82,7 +81,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         }
       },
 
-      _notify: function(mxns) {
+      _notify: function() {
         this._beforeCallListeners();
         this._callListeners();
       },
@@ -164,8 +163,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           }
         }
         // process adds
-        for (var i=0, s; (i<splices.length) && (s=splices[i]); i++) {
+        for (i=0, s; (i<splices.length) && (s=splices[i]); i++) {
-          for (var j=s.index; j < s.index + s.addedCount; j++) {
+          for (j=s.index; j < s.index + s.addedCount; j++) {
             info.addedNodes.push(newNodes[j]);
           }
         }
@@ -189,9 +188,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       var baseSetup = DomApi.EffectiveNodesObserver.prototype._setup;
       var baseCleanup = DomApi.EffectiveNodesObserver.prototype._cleanup;
 
-      var beforeCallListeners = DomApi.EffectiveNodesObserver
-        .prototype._beforeCallListeners;
-
       Polymer.Base.extend(DomApi.EffectiveNodesObserver.prototype, {
 
         _setup: function() {

src/lib/dom-api-shady.html

@@ -587,7 +587,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           return this.node.textContent;
         } else {
           var tc = [];
-          for (var i = 0, cn = this.childNodes, c; c = cn[i]; i++) {
+          for (var i = 0, cn = this.childNodes, c; (c = cn[i]); i++) {
             if (c.nodeType !== Node.COMMENT_NODE) {
               tc.push(c.textContent);
             }

src/lib/dom-innerHTML.html

@@ -89,7 +89,7 @@ Polymer.domInnerHTML = (function() {
         var tagName = node.localName;
         var s = '<' + tagName;
         var attrs = node.attributes;
-        for (var i = 0, attr; attr = attrs[i]; i++) {
+        for (var i = 0, attr; (attr = attrs[i]); i++) {
           s += ' ' + attr.name + '="' + escapeAttr(attr.value) + '"';
         }
         s += '>';

src/lib/dom-module.html

@@ -45,7 +45,7 @@
      * @param {String} id The id at which to register the dom-module.
      */
     register: function(id) {
-      var id = id || this.id ||
+      id = id || this.id ||
         this.getAttribute('name') || this.getAttribute('is');
       if (id) {
         this.id = id;

src/lib/dom-tree-api.html

@@ -23,7 +23,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    * TreeApi is a dom manipulation library used by Shady/Polymer.dom to
    * manipulate composed and logical trees.
    */
-  var TreeApi = Polymer.TreeApi = {
+  Polymer.TreeApi = {
 
     // sad but faster than slice...
     arrayCopyChildNodes: function(parent) {

src/lib/render-status.html

@@ -85,7 +85,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       for (var i=0, h; i < callbacks.length; i++) {
         h = callbacks[i];
         h[1].apply(h[0], h[2] || Polymer.nar);
-      };
+      }
     }
   };
 

src/lib/style-defaults.html

@@ -14,7 +14,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   Polymer.StyleDefaults = (function() {
 
     var styleProperties = Polymer.StyleProperties;
-    var styleUtil = Polymer.StyleUtil;
     var StyleCache = Polymer.StyleCache;
 
     var api = {

src/lib/style-extends.html

@@ -25,10 +25,10 @@ Polymer.StyleExtends = (function() {
       var rules = styleUtil.rulesForStyle(style);
       var self = this;
       styleUtil.forEachRule(rules, function(rule) {
-        var map = self._mapRule(rule);
+        self._mapRuleOntoParent(rule);
         if (rule.parent) {
           var m;
-          while (m = self.rx.EXTEND.exec(rule.cssText)) {
+          while ((m = self.rx.EXTEND.exec(rule.cssText))) {
             var extend = m[1];
             var extendor = self._findExtendor(extend, rule);
             if (extendor) {
@@ -46,7 +46,7 @@ Polymer.StyleExtends = (function() {
       }, true);
     },
 
-    _mapRule: function(rule) {
+    _mapRuleOntoParent: function(rule) {
       if (rule.parent) {
         var map = rule.parent.map || (rule.parent.map = {});
         var parts = rule.selector.split(',');

src/lib/style-properties.html

@@ -71,7 +71,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           var m, rx = this.rx.VAR_ASSIGN;
           var cssText = rule.parsedCssText;
           var any;
-          while (m = rx.exec(cssText)) {
+          while ((m = rx.exec(cssText))) {
             // note: group 2 is var, 3 is mixin
             properties[m[1]] = (m[2] || m[3]).trim();
             any = true;
@@ -93,7 +93,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
       collectPropertiesInCssText: function(cssText, props) {
         var m;
-        while (m = this.rx.VAR_CAPTURE.exec(cssText)) {
+        while ((m = this.rx.VAR_CAPTURE.exec(cssText))) {
           props[m[1]] = true;
           var def = m[2];
           if (def && def.match(this.rx.IS_VAR)) {
@@ -145,7 +145,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       valueForProperties: function(property, props) {
         var parts = property.split(';');
         for (var i=0, p, m; i<parts.length; i++) {
-          if (p = parts[i]) {
+          if ((p = parts[i])) {
             m = p.match(this.rx.MIXIN_MATCH);
             if (m) {
               p = this.valueForProperty(props[m[1]], props);

src/lib/template/dom-repeat.html

@@ -409,7 +409,6 @@ Then the `observe` property should be configured as follows:
     },
 
     _render: function() {
-      var c = this.collection;
       // Choose rendering path: full vs. incremental using splices
       if (this._needFullRefresh) {
         // Full refresh when items, sort, or filter change, or when render() called
@@ -499,7 +498,7 @@ Then the `observe` property should be configured as follows:
         });
       }
       // Generate instances and assign items and keys
-      for (var i=0; i<keys.length; i++) {
+      for (i=0; i<keys.length; i++) {
         var key = keys[i];
         var inst = this._instances[i];
         if (inst) {
@@ -529,23 +528,23 @@ Then the `observe` property should be configured as follows:
     // first, and added rows are insertion-sorted into place using user sort
     _applySplicesUserSort: function(splices) {
       var c = this.collection;
-      var instances = this._instances;
       var keyMap = {};
+      var key;
       // Dedupe added and removed keys to a final added/removed map
       for (var i=0, s; (i<splices.length) && (s=splices[i]); i++) {
         for (var j=0; j<s.removed.length; j++) {
-          var key = s.removed[j];
+          key = s.removed[j];
           keyMap[key] = keyMap[key] ? null : -1;
         }
-        for (var j=0; j<s.added.length; j++) {
+        for (j=0; j<s.added.length; j++) {
-          var key = s.added[j];
+          key = s.added[j];
           keyMap[key] = keyMap[key] ? null : 1;
         }
       }
       // Convert added/removed key map to added/removed arrays
       var removedIdxs = [];
       var addedKeys = [];
-      for (var key in keyMap) {
+      for (key in keyMap) {
         if (keyMap[key] === -1) {
           removedIdxs.push(this._keyToInstIdx[key]);
         }
@@ -559,7 +558,7 @@ Then the `observe` property should be configured as follows:
         // so we don't invalidate instance index
         // use numeric sort, default .sort is alphabetic
         removedIdxs.sort(this._numericSort);
-        for (var i=removedIdxs.length-1; i>=0 ; i--) {
+        for (i=removedIdxs.length-1; i>=0 ; i--) {
           var idx = removedIdxs[i];
           // Removed idx may be undefined if item was previously filtered out
           if (idx !== undefined) {
@@ -583,7 +582,7 @@ Then the `observe` property should be configured as follows:
         });
         // Insertion-sort new instances into place (from pool or newly created)
         var start = 0;
-        for (var i=0; i<addedKeys.length; i++) {
+        for (i=0; i<addedKeys.length; i++) {
           start = this._insertRowUserSort(start, addedKeys[i]);
         }
       }
@@ -622,13 +621,12 @@ Then the `observe` property should be configured as follows:
     // rows are as placeholders, and placeholders are updated to
     // actual rows at the end to take full advantage of removed rows
     _applySplicesArrayOrder: function(splices) {
-      var c = this.collection;
       for (var i=0, s; (i<splices.length) && (s=splices[i]); i++) {
         // Detach & pool removed instances
         for (var j=0; j<s.removed.length; j++) {
           this._detachAndRemoveInstance(s.index);
         }
-        for (var j=0; j<s.addedKeys.length; j++) {
+        for (j=0; j<s.addedKeys.length; j++) {
           this._insertPlaceholder(s.index+j, s.addedKeys[j]);
         }
       }

src/lib/template/templatizer.html

@@ -181,7 +181,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       Polymer.dom.addDebouncer(this.debounce('_debounceTemplate', fn));
     },
 
-    _flushTemplates: function(debouncerExpired) {
+    _flushTemplates: function() {
       Polymer.dom.flush();
     },
 
@@ -191,7 +191,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         archetype._addPropertyEffect(prop, 'function',
           this._createHostPropEffector(prop));
       }
-      for (var prop in this._instanceProps) {
+      for (prop in this._instanceProps) {
         archetype._addPropertyEffect(prop, 'function',
           this._createInstancePropEffector(prop));
       }
@@ -309,12 +309,14 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     },
 
     // Extension points for Templatizer sub-classes
+    /* eslint-disable no-unused-vars */
     _showHideChildren: function(hidden) { },
     _forwardInstancePath: function(inst, path, value) { },
     _forwardInstanceProp: function(inst, prop, value) { },
     // Defined-check rather than thunk used to avoid unnecessary work for these:
     // _forwardParentPath: function(path, value) { },
     // _forwardParentProp: function(prop, value) { },
+    /* eslint-enable no-unused-vars */
 
     _notifyPathUpImpl: function(path, value) {
       var dataHost = this.dataHost;
@@ -448,7 +450,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         // An element with a _templateInstance marks the top boundary
         // of a scope; walk up until we find one, and then ensure that
         // its dataHost matches `this`, meaning this dom-repeat stamped it
-        if (model = el._templateInstance) {
+        if ((model = el._templateInstance)) {
           // Found an element stamped by another template; keep walking up
           // from its dataHost
           if (model.dataHost != this) {

src/micro/attributes.html

@@ -108,7 +108,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     _setAttributeToProperty: function(model, attribute, property, info) {
       // Don't deserialize back to property if currently reflecting
       if (!this._serializing) {
-        var property = property || Polymer.CaseMap.dashToCamelCase(attribute);
+        property = (property || Polymer.CaseMap.dashToCamelCase(attribute));
         // fallback to property lookup
         // TODO(sorvell): check for _propertyInfo existence because of dom-bind
         info = info || (this._propertyInfo && this._propertyInfo[property]);
@@ -236,6 +236,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
      * @return {string} String serialized from the provided property value.
      */
     serialize: function(value) {
+      /* eslint-disable no-fallthrough */
       switch (typeof value) {
         case 'boolean':
           return value ? '' : undefined;
@@ -255,7 +256,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           return value != null ? value : undefined;
       }
     }
-
+    /* eslint-enable no-fallthrough */
   });
 
 </script>

src/micro/properties.html

@@ -116,7 +116,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           if (info) {
             return info;
           }
-        };
+        }
       }
       return info || Polymer.nob;
     },
@@ -138,7 +138,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     // union properties, behaviors.properties, and propertyEffects
     _prepPropertyInfo: function() {
       this._propertyInfo = {};
-      for (var i=0, p; i < this.behaviors.length; i++) {
+      for (var i=0; i < this.behaviors.length; i++) {
         this._addPropertyInfo(this._propertyInfo, this.behaviors[i].properties);
       }
       this._addPropertyInfo(this._propertyInfo, this.properties);
@@ -174,7 +174,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           }
         }
       }
-    },
+    }
 
   });
 

src/mini/shady.html

@@ -342,9 +342,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           d -= s.addedCount;
         }
         // process adds
-        for (var i=0, s, next; (i<splices.length) && (s=splices[i]); i++) {
+        for (var i=0, s, next; (i<splices.length) && (s=splices[i]); i++) { //eslint-disable-line no-redeclare
           next = composed[s.index];
-          for (var j=s.index, n; j < s.index + s.addedCount; j++) {
+          for (j=s.index, n; j < s.index + s.addedCount; j++) {
             n = children[j];
             TreeApi.Composed.insertBefore(container, n, next);
             // TODO(sorvell): is this splice strictly needed?

src/standard/annotations.html

@@ -227,7 +227,7 @@ TODO(sjmiles): this module should produce either syntactic metadata
     },
 
     // push configuration references at configure time
-    _configureAnnotationReferences: function(config) {
+    _configureAnnotationReferences: function() {
       var notes = this._notes;
       var nodes = this._nodes;
       for (var i=0; i<notes.length; i++) {

src/standard/gestures.html

@@ -255,7 +255,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         }
       }
       // enforce gesture recognizer order
-      for (var i = 0, r; i < recognizers.length; i++) {
+      for (i = 0, r; i < recognizers.length; i++) {
         r = recognizers[i];
         if (gs[r.name] && !handled[r.name]) {
           handled[r.name] = true;

src/standard/notify-path.html

@@ -183,18 +183,19 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           // item in collection associated with key for that item
           if (array) {
             var coll = Polymer.Collection.get(array);
+            var old, key;
             if (last[0] == '#') {
               // Part was key; lookup item in collection
-              var key = last;
+              key = last;
-              var old = coll.getItem(key);
+              old = coll.getItem(key);
               // Update last part from key to index: O(n) lookup unavoidable
               last = array.indexOf(old);
               // Replace item associated with key in collection
               coll.setItem(key, value);
             } else if (parseInt(last, 10) == last) {
               // Dereference index & lookup collection key
-              var old = prop[last];
+              old = prop[last];
-              var key = coll.getKey(old);
+              key = coll.getKey(old);
               // Translate array indices to collection keys for path notificaiton
               parts[i] = key;
               // Replace item associated with key in collection
@@ -527,7 +528,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
        * @param {...any} var_args Items to insert into array.
        * @return {Array} Array of removed items.
        */
-      splice: function(path, start, deleteCount) {
+      splice: function(path, start) {
         var info = {};
         var array = this._get(path, this, info);
         // Normalize fancy native splice handling of crazy start values

src/standard/utils.html

@@ -144,7 +144,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     getEffectiveTextContent: function() {
       var cn = this.getEffectiveChildNodes();
       var tc = [];
-      for (var i=0, c; c = cn[i]; i++) {
+      for (var i=0, c; (c = cn[i]); i++) {
         if (c.nodeType !== Node.COMMENT_NODE) {
           tc.push(Polymer.dom(c).textContent);
         }
@@ -215,7 +215,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     fire: function(type, detail, options) {
       options = options || Polymer.nob;
       var node = options.node || this;
-      var detail = (detail === null || detail === undefined) ? {} : detail;
+      detail = (detail === null || detail === undefined) ? {} : detail;
       var bubbles = options.bubbles === undefined ? true : options.bubbles;
       var cancelable = Boolean(options.cancelable);
       var useCache = options._useCache;

src/standard/x-styling.html

@@ -19,7 +19,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
     var propertyUtils = Polymer.StyleProperties;
     var styleTransformer = Polymer.StyleTransformer;
-    var styleUtil = Polymer.StyleUtil;
     var styleDefaults = Polymer.StyleDefaults;
 
     var nativeShadow = Polymer.Settings.useNativeShadow;
@@ -93,7 +92,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
       _findStyleHost: function() {
         var e = this, root;
-        while (root = Polymer.dom(e).getOwnerRoot()) {
+        while ((root = Polymer.dom(e).getOwnerRoot())) {
           if (Polymer.isInstance(root.host)) {
             return root.host;
           }