allow the use of data attributes to define popover options

twbs · Oct 30, 2011 · 640fd15 · 640fd15
1 parent ea50e8a
commit 640fd15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docs/javascript.html b/docs/javascript.html
@@ -555,6 +555,8 @@ <h3>Options</h3>
              </tr>
             </tbody>
           </table>
+          <p><span class="label notice">Notice</span> Individual twipsy instance options can alternatively be specified through the use of data attributes.</code></p>
+          <pre class="prettyprint linenums">&lt;a href="#" data-placement="below" rel='twipsy' title='Some title text'&gt;text&lt;/a&gt;</pre>
           <h3>Methods</h3>
           <h4>$().twipsy(options)</h4>
           <p>Attaches a twipsy handler to an element collection.</p>
@@ -669,7 +671,7 @@ <h3>Options</h3>
                <td>content</td>
                <td>string, function</td>
                <td>'data-content'</td>
-               <td>attribute or method for retrieving content text</td>
+               <td>a string or method for retrieving content text. if none are provided, content will be sourced from a data-content attribute.</td>
              </tr>
              <tr>
                <td>trigger</td>
@@ -679,6 +681,8 @@ <h3>Options</h3>
              </tr>
             </tbody>
           </table>
+          <p><span class="label notice">Notice</span> Individual popover instance options can alternatively be specified through the use of data attributes.</code></p>
+          <pre class="prettyprint linenums">&lt;a data-placement="below" href="#" class="btn danger" rel="popover"&gt;text&lt;/a&gt;</pre>
           <h3>Methods</h3>
           <h4>$().popover(options)</h4>
           <p>Initializes popovers for an element collection.</p>

diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
@@ -47,7 +47,7 @@
        , o = this.options
 
       if (typeof this.options.content == 'string') {
-        content = $e.attr(o.content)
+        content = this.options.content
       } else if (typeof this.options.content == 'function') {
         content = this.options.content.call(this.$element[0])
       }
@@ -74,6 +74,6 @@
     return this
   }
 
-  $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, { content: 'data-content', placement: 'right'})
+  $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, { placement: 'right'})
 
 }( window.jQuery || window.ender );
diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js
@@ -299,7 +299,7 @@
   }
 
   $.fn.twipsy.elementOptions = function(ele, options) {
-    return $.metadata ? $.extend({}, options, $(ele).metadata()) : options
+    return $.extend({}, options, $(ele).data())
   }
 
 }( window.jQuery || window.ender );