Merge pull request #27 from Polymer/fix26

Fixes #26
googlearchive · Jan 26, 2015 · 0adb0ce · 0adb0ce
2 parents 5631d73 + 0ec3bb5
commit 0adb0ce
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/core-tooltip.html b/core-tooltip.html
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
 The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
@@ -77,8 +77,8 @@
 <!-- TODO: possibly reuse core-overlay. -->
 <polymer-element name="core-tooltip" attributes="noarrow position label show tipAttribute" role="tooltip" tabindex="0">
 <template>
-
   <link rel="stylesheet" href="core-tooltip.css">
+
   <div id="tooltip" hidden?="{{!hasTooltipContent}}"
        class="core-tooltip {{position}} {{ {noarrow: noarrow, show: show && !disabled} | tokenList}}">
     <content id="c" select="[{{tipAttribute}}]">{{label}}</content>
@@ -165,7 +165,7 @@
         this.tipElement = null;
 
         for (var i = 0, el; el = this.$.c.getDistributedNodes()[i]; ++i) {
-          if (el.hasAttribute && el.hasAttribute('tip')) {
+          if (el.hasAttribute && el.hasAttribute(this.tipAttribute)) {
             this.tipElement = el;
             break;
           }

diff --git a/demo.html b/demo.html
@@ -1,6 +1,6 @@
 <!--
     @license
-    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
     This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
     The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
     The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt

diff --git a/index.html b/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
 The complete set of authors may be found at http://polymer.github.io/AUTHORS
 The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS

diff --git a/metadata.html b/metadata.html
@@ -1,6 +1,6 @@
 <!--
     @license
-    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
     This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
     The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
     The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt