aboutsummaryrefslogtreecommitdiff
path: root/js/popover.js
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-06-23 11:07:18 -0700
committerChris Rebert <[email protected]>2014-06-23 11:11:59 -0700
commitc2c19a4d2d45d8ccb5c84d293dea35a94148c9a4 (patch)
treef12ed485a1a3f84ce60c6a195e8efca27f418042 /js/popover.js
parentbc895a4b43ecfd2ad8c3793fdd6d8bada9d93186 (diff)
downloadbootstrap-c2c19a4d2d45d8ccb5c84d293dea35a94148c9a4.tar.xz
bootstrap-c2c19a4d2d45d8ccb5c84d293dea35a94148c9a4.zip
Revert UMD (#13772 & friends) for now, due to #13812.
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0. Revert "some changes from #13801 - add strict mode back and ==" This reverts commit 2b302f69eea416bc85e7827b7d7a74d49f879662. Revert "Fix regression of #10038 introduced by #13772" This reverts commit e9d6756a1ac76a9db31a41e8e03f663bedc41b70. Revert "MD/CommonJS/Globals #12909" This reverts commit 1c6fa9010daf0d0c21de9e20fe6ac4dba1788d90. Revert "address #13811" This reverts commit f347d7d955bbb17234b8e12c68efae7d516ce62c. Conflicts: js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tab.js js/tooltip.js
Diffstat (limited to 'js/popover.js')
-rw-r--r--js/popover.js156
1 files changed, 75 insertions, 81 deletions
diff --git a/js/popover.js b/js/popover.js
index 919e9dc87..c8ec3bef4 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -7,113 +7,107 @@
* ======================================================================== */
-+function () { 'use strict';
++function ($) {
+ 'use strict';
- (function (o_o) {
- typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
- typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
- })(function ($) {
+ // POPOVER PUBLIC CLASS DEFINITION
+ // ===============================
- // POPOVER PUBLIC CLASS DEFINITION
- // ===============================
+ var Popover = function (element, options) {
+ this.init('popover', element, options)
+ }
- var Popover = function (element, options) {
- this.init('popover', element, options)
- }
+ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
- if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
- Popover.VERSION = '3.1.1'
-
- Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
- placement: 'right',
- trigger: 'click',
- content: '',
- template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
- })
+ Popover.VERSION = '3.1.1'
+ Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
+ placement: 'right',
+ trigger: 'click',
+ content: '',
+ template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+ })
- // NOTE: POPOVER EXTENDS tooltip.js
- // ================================
- Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
+ // NOTE: POPOVER EXTENDS tooltip.js
+ // ================================
- Popover.prototype.constructor = Popover
+ Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
- Popover.prototype.getDefaults = function () {
- return Popover.DEFAULTS
- }
+ Popover.prototype.constructor = Popover
- Popover.prototype.setContent = function () {
- var $tip = this.tip()
- var title = this.getTitle()
- var content = this.getContent()
+ Popover.prototype.getDefaults = function () {
+ return Popover.DEFAULTS
+ }
- $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
- $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events
- this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
- ](content)
+ Popover.prototype.setContent = function () {
+ var $tip = this.tip()
+ var title = this.getTitle()
+ var content = this.getContent()
- $tip.removeClass('fade top bottom left right in')
+ $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+ $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events
+ this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
+ ](content)
- // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
- // this manually by checking the contents.
- if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
- }
+ $tip.removeClass('fade top bottom left right in')
- Popover.prototype.hasContent = function () {
- return this.getTitle() || this.getContent()
- }
+ // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+ // this manually by checking the contents.
+ if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
+ }
- Popover.prototype.getContent = function () {
- var $e = this.$element
- var o = this.options
+ Popover.prototype.hasContent = function () {
+ return this.getTitle() || this.getContent()
+ }
- return $e.attr('data-content')
- || (typeof o.content == 'function' ?
- o.content.call($e[0]) :
- o.content)
- }
+ Popover.prototype.getContent = function () {
+ var $e = this.$element
+ var o = this.options
- Popover.prototype.arrow = function () {
- return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
- }
+ return $e.attr('data-content')
+ || (typeof o.content == 'function' ?
+ o.content.call($e[0]) :
+ o.content)
+ }
- Popover.prototype.tip = function () {
- if (!this.$tip) this.$tip = $(this.options.template)
- return this.$tip
- }
+ Popover.prototype.arrow = function () {
+ return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
+ }
+ Popover.prototype.tip = function () {
+ if (!this.$tip) this.$tip = $(this.options.template)
+ return this.$tip
+ }
- // POPOVER PLUGIN DEFINITION
- // =========================
- function Plugin(option) {
- return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.popover')
- var options = typeof option == 'object' && option
+ // POPOVER PLUGIN DEFINITION
+ // =========================
- if (!data && option == 'destroy') return
- if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
- if (typeof option == 'string') data[option]()
- })
- }
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.popover')
+ var options = typeof option == 'object' && option
- var old = $.fn.popover
+ if (!data && option == 'destroy') return
+ if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
+ if (typeof option == 'string') data[option]()
+ })
+ }
- $.fn.popover = Plugin
- $.fn.popover.Constructor = Popover
+ var old = $.fn.popover
+ $.fn.popover = Plugin
+ $.fn.popover.Constructor = Popover
- // POPOVER NO CONFLICT
- // ===================
- $.fn.popover.noConflict = function () {
- $.fn.popover = old
- return this
- }
+ // POPOVER NO CONFLICT
+ // ===================
- })
+ $.fn.popover.noConflict = function () {
+ $.fn.popover = old
+ return this
+ }
-}();
+}(jQuery);