Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

added option in popover for displaying content and title as text inst…

…ead of html
  • Loading branch information...
commit 11d6a9b95ba5982a58b79659d548d2c7ab2ff116 1 parent b261f97
authored May 09, 2012
6  docs/javascript.html
@@ -895,6 +895,12 @@ <h4 id="three">three</h4>
895 895
                <td>apply a css fade transition to the tooltip</td>
896 896
              </tr>
897 897
              <tr>
  898
+               <td>html</td>
  899
+               <td>boolean</td>
  900
+               <td>true</td>
  901
+               <td>display content and title as html if detected in either field, otherwise display content and title as text</td>
  902
+             </tr>
  903
+             <tr>
898 904
                <td>placement</td>
899 905
                <td>string|function</td>
900 906
                <td>'right'</td>
5  js/bootstrap-popover.js
@@ -42,9 +42,10 @@
42 42
       var $tip = this.tip()
43 43
         , title = this.getTitle()
44 44
         , content = this.getContent()
  45
+        , o = this.options
45 46
 
46  
-      $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title)
47  
-      $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content)
  47
+      $tip.find('.popover-title')[this.isHTML(title) && o.html ? 'html' : 'text'](title)
  48
+      $tip.find('.popover-content > *')[this.isHTML(content) && o.html ? 'html' : 'text'](content)
48 49
 
49 50
       $tip.removeClass('fade top bottom left right in')
50 51
     }

0 notes on commit 11d6a9b

Please sign in to comment.
Something went wrong with that request. Please try again.