From: Rod Vagg <rod@vagg.org>
Date: Mon, 7 Nov 2011 01:02:51 +0000 (+1100)
Subject: Merge remote-tracking branch 'twitter/master' into poveropt
X-Git-Tag: v2.0.0~23^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d725ac2feb0abc1469ff526a29de2cf426639ad2;p=thirdparty%2Fbootstrap.git

Merge remote-tracking branch 'twitter/master' into poveropt

Conflicts:
	js/bootstrap-popover.js
---

d725ac2feb0abc1469ff526a29de2cf426639ad2
diff --cc js/bootstrap-popover.js
index 128bc54127,c637784157..e8b49af3c2
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@@ -80,9 -81,10 +81,12 @@@
  
    $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
      placement: 'right'
+   , content: 'data-content'
    , template: '<div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div>'
 +  , titleSelector: '.title'
 +  , contentSelector: '.content p'
    })
  
+   $.fn.twipsy.rejectAttrOptions.push( 'content' )
+ 
 -}( window.jQuery || window.ender );
 +}( window.jQuery || window.ender );
diff --cc js/bootstrap-twipsy.js
index 9eb6e79f4e,5ebbddd675..24c1ced8c7
--- a/js/bootstrap-twipsy.js
+++ b/js/bootstrap-twipsy.js
@@@ -302,11 -302,20 +302,21 @@@
    , title: 'title'
    , trigger: 'hover'
    , template: '<div class="twipsy-arrow"></div><div class="twipsy-inner"></div>'
 +  , contentSelector: '.twipsy-inner'
    }
  
+   $.fn.twipsy.rejectAttrOptions = [ 'title' ]
+ 
    $.fn.twipsy.elementOptions = function(ele, options) {
-     return $.extend({}, options, $(ele).data())
+     var data = $(ele).data()
+       , rejects = $.fn.twipsy.rejectAttrOptions
+       , i = rejects.length
+ 
+     while (i--) {
+       delete data[rejects[i]]
+     }
+ 
+     return $.extend({}, options, data)
    }
  
 -}( window.jQuery || window.ender );
 +}( window.jQuery || window.ender );