vendor/assets/javascripts/twitter/bootstrap/popover.js in anjlab-bootstrap-rails-2.3.1.2 vs vendor/assets/javascripts/twitter/bootstrap/popover.js in anjlab-bootstrap-rails-3.0.0.0.alpha1

- old
+ new

@@ -1,9 +1,9 @@ -/* =========================================================== - * bootstrap-popover.js v2.3.1 +/* ======================================================================== + * Bootstrap: popover.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== + * ======================================================================== * Copyright 2012 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,99 +13,94 @@ * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * =========================================================== */ + * ======================================================================== */ -!function ($) { ++function ($) { "use strict"; - "use strict"; // jshint ;_; + // POPOVER PUBLIC CLASS DEFINITION + // =============================== - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - var Popover = function (element, options) { this.init('popover', element, options) } + Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right' + , trigger: 'click' + , content: '' + , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' + }) - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ - constructor: Popover + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() + Popover.prototype.constructor = Popover - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } - $tip.removeClass('fade top bottom left right in') - } + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() - , hasContent: function () { - return this.getTitle() || this.getContent() - } + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) - , getContent: function () { - var content - , $e = this.$element - , o = this.options + $tip.removeClass('fade top bottom left right in') + } - content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - || $e.attr('data-content') + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } - return content - } + Popover.prototype.getContent = function () { + var content = typeof this.options.content == 'function' ? + this.options.content.call(this.$element[0]) : + this.options.content - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } + return content || this.$element.attr('data-content') + } - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } - }) + Popover.prototype.destroy = function () { + this.hide().$element.off('.' + this.type).removeData(this.type) + } - /* POPOVER PLUGIN DEFINITION - * ======================= */ + // POPOVER PLUGIN DEFINITION + // ========================= var old = $.fn.popover $.fn.popover = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (typeof option == 'string') data[option]() }) } $.fn.popover.Constructor = Popover - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , trigger: 'click' - , content: '' - , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' - }) - - /* POPOVER NO CONFLICT - * =================== */ + // POPOVER NO CONFLICT + // =================== $.fn.popover.noConflict = function () { $.fn.popover = old return this }