Merge pull request #1838 from trevordixon/patch-1

Use var keyword when declaring local variable so it doesn't leak to global scope.
Polymer · Jun 12, 2015 · 19758b7 · 19758b7
2 parents 44e807c + 0bc4e44
commit 19758b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lib/style-properties.html b/src/lib/style-properties.html
@@ -270,7 +270,7 @@
       applyElementScopeSelector: function(element, selector, old, viaAttr) {
         var c = viaAttr ? element.getAttribute(styleTransformer.SCOPE_NAME) :
           element.className;
-        v = old ? c.replace(old, selector) :
+        var v = old ? c.replace(old, selector) :
           (c ? c + ' ' : '') + this.XSCOPE_NAME + ' ' + selector;
         if (c !== v) {
           if (viaAttr) {

diff --git a/src/standard/x-styling.html b/src/standard/x-styling.html
@@ -81,7 +81,7 @@
         var globalCached = Boolean(info) && !scopeCached;
         // now we have properties and a cached style if one
         // is available.
-        style = this._applyStyleProperties(info);
+        var style = this._applyStyleProperties(info);
         // no cache so store in cache
         //console.warn(this, scopeCached, globalCached, info && info._scopeSelector);
         if (!scopeCached) {