anjlab-bootstrap-rails 2.0.2.1 → 2.0.3.rc
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +36 -25
- data/lib/bootstrap-rails/version.rb +1 -1
- data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
- data/vendor/assets/images/glyphicons-halflings.png +0 -0
- data/vendor/assets/javascripts/bootstrap-alert.js +28 -32
- data/vendor/assets/javascripts/bootstrap-button.js +29 -33
- data/vendor/assets/javascripts/bootstrap-carousel.js +27 -19
- data/vendor/assets/javascripts/bootstrap-collapse.js +44 -25
- data/vendor/assets/javascripts/bootstrap-dropdown.js +18 -10
- data/vendor/assets/javascripts/bootstrap-modal.js +25 -17
- data/vendor/assets/javascripts/bootstrap-popover.js +13 -10
- data/vendor/assets/javascripts/bootstrap-scrollspy.js +43 -17
- data/vendor/assets/javascripts/bootstrap-tab.js +12 -7
- data/vendor/assets/javascripts/bootstrap-tooltip.js +40 -35
- data/vendor/assets/javascripts/bootstrap-transition.js +30 -20
- data/vendor/assets/javascripts/bootstrap-typeahead.js +25 -11
- data/vendor/assets/stylesheets/accordion.scss +5 -0
- data/vendor/assets/stylesheets/bootstrap.scss +2 -3
- data/vendor/assets/stylesheets/button-groups.scss +55 -36
- data/vendor/assets/stylesheets/buttons.scss +15 -11
- data/vendor/assets/stylesheets/close.scss +12 -1
- data/vendor/assets/stylesheets/code.scss +4 -4
- data/vendor/assets/stylesheets/component-animations.scss +5 -5
- data/vendor/assets/stylesheets/dropdowns.scss +15 -20
- data/vendor/assets/stylesheets/forms.scss +58 -30
- data/vendor/assets/stylesheets/labels-badges.scss +54 -0
- data/vendor/assets/stylesheets/layouts.scss +1 -1
- data/vendor/assets/stylesheets/mixins.scss +58 -46
- data/vendor/assets/stylesheets/modals.scss +1 -1
- data/vendor/assets/stylesheets/navbar.scss +64 -41
- data/vendor/assets/stylesheets/navs.scss +36 -36
- data/vendor/assets/stylesheets/progress-bars.scss +14 -6
- data/vendor/assets/stylesheets/reset.scss +3 -3
- data/vendor/assets/stylesheets/responsive-1200px-min.scss +26 -0
- data/vendor/assets/stylesheets/responsive-767px-max.scss +149 -0
- data/vendor/assets/stylesheets/responsive-768px-979px.scss +17 -0
- data/vendor/assets/stylesheets/responsive-navbar.scss +146 -0
- data/vendor/assets/stylesheets/responsive-utilities.scss +41 -0
- data/vendor/assets/stylesheets/responsive.scss +14 -337
- data/vendor/assets/stylesheets/sprites.scss +37 -5
- data/vendor/assets/stylesheets/tables.scss +22 -5
- data/vendor/assets/stylesheets/thumbnails.scss +14 -2
- data/vendor/assets/stylesheets/type.scss +7 -6
- data/vendor/assets/stylesheets/variables.scss +10 -6
- metadata +43 -16
- data/vendor/assets/stylesheets/badges.scss +0 -36
- data/vendor/assets/stylesheets/labels.scss +0 -38
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ============================================================
|
2
|
-
* bootstrap-dropdown.js v2.0.
|
2
|
+
* bootstrap-dropdown.js v2.0.3
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
4
4
|
* ============================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -18,15 +18,16 @@
|
|
18
18
|
* ============================================================ */
|
19
19
|
|
20
20
|
|
21
|
-
!function(
|
21
|
+
!function ($) {
|
22
|
+
|
23
|
+
"use strict"; // jshint ;_;
|
22
24
|
|
23
|
-
"use strict"
|
24
25
|
|
25
26
|
/* DROPDOWN CLASS DEFINITION
|
26
27
|
* ========================= */
|
27
28
|
|
28
29
|
var toggle = '[data-toggle="dropdown"]'
|
29
|
-
, Dropdown = function (
|
30
|
+
, Dropdown = function (element) {
|
30
31
|
var $el = $(element).on('click.dropdown.data-api', this.toggle)
|
31
32
|
$('html').on('click.dropdown.data-api', function () {
|
32
33
|
$el.parent().removeClass('open')
|
@@ -37,12 +38,16 @@
|
|
37
38
|
|
38
39
|
constructor: Dropdown
|
39
40
|
|
40
|
-
, toggle: function (
|
41
|
+
, toggle: function (e) {
|
41
42
|
var $this = $(this)
|
42
|
-
, selector = $this.attr('data-target')
|
43
43
|
, $parent
|
44
|
+
, selector
|
44
45
|
, isActive
|
45
46
|
|
47
|
+
if ($this.is('.disabled, :disabled')) return
|
48
|
+
|
49
|
+
selector = $this.attr('data-target')
|
50
|
+
|
46
51
|
if (!selector) {
|
47
52
|
selector = $this.attr('href')
|
48
53
|
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
@@ -54,7 +59,8 @@
|
|
54
59
|
isActive = $parent.hasClass('open')
|
55
60
|
|
56
61
|
clearMenus()
|
57
|
-
|
62
|
+
|
63
|
+
if (!isActive) $parent.toggleClass('open')
|
58
64
|
|
59
65
|
return false
|
60
66
|
}
|
@@ -69,7 +75,7 @@
|
|
69
75
|
/* DROPDOWN PLUGIN DEFINITION
|
70
76
|
* ========================== */
|
71
77
|
|
72
|
-
$.fn.dropdown = function (
|
78
|
+
$.fn.dropdown = function (option) {
|
73
79
|
return this.each(function () {
|
74
80
|
var $this = $(this)
|
75
81
|
, data = $this.data('dropdown')
|
@@ -86,7 +92,9 @@
|
|
86
92
|
|
87
93
|
$(function () {
|
88
94
|
$('html').on('click.dropdown.data-api', clearMenus)
|
89
|
-
$('body')
|
95
|
+
$('body')
|
96
|
+
.on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
|
97
|
+
.on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
90
98
|
})
|
91
99
|
|
92
|
-
}(
|
100
|
+
}(window.jQuery);
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* =========================================================
|
2
|
-
* bootstrap-modal.js v2.0.
|
2
|
+
* bootstrap-modal.js v2.0.3
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#modals
|
4
4
|
* =========================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -18,14 +18,15 @@
|
|
18
18
|
* ========================================================= */
|
19
19
|
|
20
20
|
|
21
|
-
!function(
|
21
|
+
!function ($) {
|
22
|
+
|
23
|
+
"use strict"; // jshint ;_;
|
22
24
|
|
23
|
-
"use strict"
|
24
25
|
|
25
26
|
/* MODAL CLASS DEFINITION
|
26
27
|
* ====================== */
|
27
28
|
|
28
|
-
var Modal = function (
|
29
|
+
var Modal = function (content, options) {
|
29
30
|
this.options = options
|
30
31
|
this.$element = $(content)
|
31
32
|
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
|
@@ -41,19 +42,23 @@
|
|
41
42
|
|
42
43
|
, show: function () {
|
43
44
|
var that = this
|
45
|
+
, e = $.Event('show')
|
46
|
+
|
47
|
+
this.$element.trigger(e)
|
44
48
|
|
45
|
-
if (this.isShown) return
|
49
|
+
if (this.isShown || e.isDefaultPrevented()) return
|
46
50
|
|
47
51
|
$('body').addClass('modal-open')
|
48
52
|
|
49
53
|
this.isShown = true
|
50
|
-
this.$element.trigger('show')
|
51
54
|
|
52
55
|
escape.call(this)
|
53
56
|
backdrop.call(this, function () {
|
54
57
|
var transition = $.support.transition && that.$element.hasClass('fade')
|
55
58
|
|
56
|
-
!that.$element.parent().length
|
59
|
+
if (!that.$element.parent().length) {
|
60
|
+
that.$element.appendTo(document.body) //don't move modals dom position
|
61
|
+
}
|
57
62
|
|
58
63
|
that.$element
|
59
64
|
.show()
|
@@ -71,21 +76,24 @@
|
|
71
76
|
})
|
72
77
|
}
|
73
78
|
|
74
|
-
, hide: function (
|
79
|
+
, hide: function (e) {
|
75
80
|
e && e.preventDefault()
|
76
81
|
|
77
|
-
if (!this.isShown) return
|
78
|
-
|
79
82
|
var that = this
|
83
|
+
|
84
|
+
e = $.Event('hide')
|
85
|
+
|
86
|
+
this.$element.trigger(e)
|
87
|
+
|
88
|
+
if (!this.isShown || e.isDefaultPrevented()) return
|
89
|
+
|
80
90
|
this.isShown = false
|
81
91
|
|
82
92
|
$('body').removeClass('modal-open')
|
83
93
|
|
84
94
|
escape.call(this)
|
85
95
|
|
86
|
-
this.$element
|
87
|
-
.trigger('hide')
|
88
|
-
.removeClass('in')
|
96
|
+
this.$element.removeClass('in')
|
89
97
|
|
90
98
|
$.support.transition && this.$element.hasClass('fade') ?
|
91
99
|
hideWithTransition.call(this) :
|
@@ -111,7 +119,7 @@
|
|
111
119
|
})
|
112
120
|
}
|
113
121
|
|
114
|
-
function hideModal(
|
122
|
+
function hideModal(that) {
|
115
123
|
this.$element
|
116
124
|
.hide()
|
117
125
|
.trigger('hidden')
|
@@ -119,7 +127,7 @@
|
|
119
127
|
backdrop.call(this)
|
120
128
|
}
|
121
129
|
|
122
|
-
function backdrop(
|
130
|
+
function backdrop(callback) {
|
123
131
|
var that = this
|
124
132
|
, animate = this.$element.hasClass('fade') ? 'fade' : ''
|
125
133
|
|
@@ -173,7 +181,7 @@
|
|
173
181
|
/* MODAL PLUGIN DEFINITION
|
174
182
|
* ======================= */
|
175
183
|
|
176
|
-
$.fn.modal = function (
|
184
|
+
$.fn.modal = function (option) {
|
177
185
|
return this.each(function () {
|
178
186
|
var $this = $(this)
|
179
187
|
, data = $this.data('modal')
|
@@ -207,4 +215,4 @@
|
|
207
215
|
})
|
208
216
|
})
|
209
217
|
|
210
|
-
}(
|
218
|
+
}(window.jQuery);
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ===========================================================
|
2
|
-
* bootstrap-popover.js v2.0.
|
2
|
+
* bootstrap-popover.js v2.0.3
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
4
4
|
* ===========================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -18,14 +18,19 @@
|
|
18
18
|
* =========================================================== */
|
19
19
|
|
20
20
|
|
21
|
-
!function(
|
21
|
+
!function ($) {
|
22
22
|
|
23
|
-
|
23
|
+
"use strict"; // jshint ;_;
|
24
|
+
|
25
|
+
|
26
|
+
/* POPOVER PUBLIC CLASS DEFINITION
|
27
|
+
* =============================== */
|
24
28
|
|
25
29
|
var Popover = function ( element, options ) {
|
26
30
|
this.init('popover', element, options)
|
27
31
|
}
|
28
32
|
|
33
|
+
|
29
34
|
/* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
|
30
35
|
========================================== */
|
31
36
|
|
@@ -38,8 +43,8 @@
|
|
38
43
|
, title = this.getTitle()
|
39
44
|
, content = this.getContent()
|
40
45
|
|
41
|
-
$tip.find('.popover-title')[
|
42
|
-
$tip.find('.popover-content > *')[
|
46
|
+
$tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title)
|
47
|
+
$tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content)
|
43
48
|
|
44
49
|
$tip.removeClass('fade top bottom left right in')
|
45
50
|
}
|
@@ -56,12 +61,10 @@
|
|
56
61
|
content = $e.attr('data-content')
|
57
62
|
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
|
58
63
|
|
59
|
-
content = content.toString().replace(/(^\s*|\s*$)/, "")
|
60
|
-
|
61
64
|
return content
|
62
65
|
}
|
63
66
|
|
64
|
-
, tip: function() {
|
67
|
+
, tip: function () {
|
65
68
|
if (!this.$tip) {
|
66
69
|
this.$tip = $(this.options.template)
|
67
70
|
}
|
@@ -74,7 +77,7 @@
|
|
74
77
|
/* POPOVER PLUGIN DEFINITION
|
75
78
|
* ======================= */
|
76
79
|
|
77
|
-
$.fn.popover = function (
|
80
|
+
$.fn.popover = function (option) {
|
78
81
|
return this.each(function () {
|
79
82
|
var $this = $(this)
|
80
83
|
, data = $this.data('popover')
|
@@ -92,4 +95,4 @@
|
|
92
95
|
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
|
93
96
|
})
|
94
97
|
|
95
|
-
}(
|
98
|
+
}(window.jQuery);
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* =============================================================
|
2
|
-
* bootstrap-scrollspy.js v2.0.
|
2
|
+
* bootstrap-scrollspy.js v2.0.3
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
4
4
|
* =============================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -17,9 +17,11 @@
|
|
17
17
|
* limitations under the License.
|
18
18
|
* ============================================================== */
|
19
19
|
|
20
|
-
!function ( $ ) {
|
21
20
|
|
22
|
-
|
21
|
+
!function ($) {
|
22
|
+
|
23
|
+
"use strict"; // jshint ;_;
|
24
|
+
|
23
25
|
|
24
26
|
/* SCROLLSPY CLASS DEFINITION
|
25
27
|
* ========================== */
|
@@ -43,25 +45,43 @@
|
|
43
45
|
constructor: ScrollSpy
|
44
46
|
|
45
47
|
, refresh: function () {
|
46
|
-
|
48
|
+
var self = this
|
49
|
+
, $targets
|
50
|
+
|
51
|
+
this.offsets = $([])
|
52
|
+
this.targets = $([])
|
53
|
+
|
54
|
+
$targets = this.$body
|
47
55
|
.find(this.selector)
|
48
56
|
.map(function () {
|
49
|
-
var
|
50
|
-
|
57
|
+
var $el = $(this)
|
58
|
+
, href = $el.data('target') || $el.attr('href')
|
59
|
+
, $href = /^#\w/.test(href) && $(href)
|
60
|
+
return ( $href
|
61
|
+
&& href.length
|
62
|
+
&& [[ $href.position().top, href ]] ) || null
|
63
|
+
})
|
64
|
+
.sort(function (a, b) { return a[0] - b[0] })
|
65
|
+
.each(function () {
|
66
|
+
self.offsets.push(this[0])
|
67
|
+
self.targets.push(this[1])
|
51
68
|
})
|
52
|
-
|
53
|
-
this.offsets = $.map(this.targets, function (id) {
|
54
|
-
return $(id).position().top
|
55
|
-
})
|
56
69
|
}
|
57
70
|
|
58
71
|
, process: function () {
|
59
72
|
var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
|
73
|
+
, scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
|
74
|
+
, maxScroll = scrollHeight - this.$scrollElement.height()
|
60
75
|
, offsets = this.offsets
|
61
76
|
, targets = this.targets
|
62
77
|
, activeTarget = this.activeTarget
|
63
78
|
, i
|
64
79
|
|
80
|
+
if (scrollTop >= maxScroll) {
|
81
|
+
return activeTarget != (i = targets.last()[0])
|
82
|
+
&& this.activate ( i )
|
83
|
+
}
|
84
|
+
|
65
85
|
for (i = offsets.length; i--;) {
|
66
86
|
activeTarget != targets[i]
|
67
87
|
&& scrollTop >= offsets[i]
|
@@ -72,21 +92,27 @@
|
|
72
92
|
|
73
93
|
, activate: function (target) {
|
74
94
|
var active
|
95
|
+
, selector
|
75
96
|
|
76
97
|
this.activeTarget = target
|
77
98
|
|
78
|
-
this
|
79
|
-
.
|
99
|
+
$(this.selector)
|
100
|
+
.parent('.active')
|
80
101
|
.removeClass('active')
|
81
102
|
|
82
|
-
|
83
|
-
|
103
|
+
selector = this.selector
|
104
|
+
+ '[data-target="' + target + '"],'
|
105
|
+
+ this.selector + '[href="' + target + '"]'
|
106
|
+
|
107
|
+
active = $(selector)
|
84
108
|
.parent('li')
|
85
109
|
.addClass('active')
|
86
110
|
|
87
|
-
if (
|
88
|
-
active.closest('li.dropdown').addClass('active')
|
111
|
+
if (active.parent('.dropdown-menu')) {
|
112
|
+
active = active.closest('li.dropdown').addClass('active')
|
89
113
|
}
|
114
|
+
|
115
|
+
active.trigger('activate')
|
90
116
|
}
|
91
117
|
|
92
118
|
}
|
@@ -122,4 +148,4 @@
|
|
122
148
|
})
|
123
149
|
})
|
124
150
|
|
125
|
-
}(
|
151
|
+
}(window.jQuery);
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ========================================================
|
2
|
-
* bootstrap-tab.js v2.0.
|
2
|
+
* bootstrap-tab.js v2.0.3
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
4
4
|
* ========================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -18,9 +18,10 @@
|
|
18
18
|
* ======================================================== */
|
19
19
|
|
20
20
|
|
21
|
-
!function(
|
21
|
+
!function ($) {
|
22
|
+
|
23
|
+
"use strict"; // jshint ;_;
|
22
24
|
|
23
|
-
"use strict"
|
24
25
|
|
25
26
|
/* TAB CLASS DEFINITION
|
26
27
|
* ==================== */
|
@@ -39,6 +40,7 @@
|
|
39
40
|
, selector = $this.attr('data-target')
|
40
41
|
, previous
|
41
42
|
, $target
|
43
|
+
, e
|
42
44
|
|
43
45
|
if (!selector) {
|
44
46
|
selector = $this.attr('href')
|
@@ -49,11 +51,14 @@
|
|
49
51
|
|
50
52
|
previous = $ul.find('.active a').last()[0]
|
51
53
|
|
52
|
-
|
53
|
-
|
54
|
-
, relatedTarget: previous
|
54
|
+
e = $.Event('show', {
|
55
|
+
relatedTarget: previous
|
55
56
|
})
|
56
57
|
|
58
|
+
$this.trigger(e)
|
59
|
+
|
60
|
+
if (e.isDefaultPrevented()) return
|
61
|
+
|
57
62
|
$target = $(selector)
|
58
63
|
|
59
64
|
this.activate($this.parent('li'), $ul)
|
@@ -127,4 +132,4 @@
|
|
127
132
|
})
|
128
133
|
})
|
129
134
|
|
130
|
-
}(
|
135
|
+
}(window.jQuery);
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ===========================================================
|
2
|
-
* bootstrap-tooltip.js v2.0.
|
2
|
+
* bootstrap-tooltip.js v2.0.3
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
4
4
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
5
5
|
* ===========================================================
|
@@ -18,14 +18,16 @@
|
|
18
18
|
* limitations under the License.
|
19
19
|
* ========================================================== */
|
20
20
|
|
21
|
-
!function( $ ) {
|
22
21
|
|
23
|
-
|
22
|
+
!function ($) {
|
23
|
+
|
24
|
+
"use strict"; // jshint ;_;
|
25
|
+
|
24
26
|
|
25
27
|
/* TOOLTIP PUBLIC CLASS DEFINITION
|
26
28
|
* =============================== */
|
27
29
|
|
28
|
-
var Tooltip = function (
|
30
|
+
var Tooltip = function (element, options) {
|
29
31
|
this.init('tooltip', element, options)
|
30
32
|
}
|
31
33
|
|
@@ -33,7 +35,7 @@
|
|
33
35
|
|
34
36
|
constructor: Tooltip
|
35
37
|
|
36
|
-
, init: function (
|
38
|
+
, init: function (type, element, options) {
|
37
39
|
var eventIn
|
38
40
|
, eventOut
|
39
41
|
|
@@ -54,7 +56,7 @@
|
|
54
56
|
this.fixTitle()
|
55
57
|
}
|
56
58
|
|
57
|
-
, getOptions: function (
|
59
|
+
, getOptions: function (options) {
|
58
60
|
options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
|
59
61
|
|
60
62
|
if (options.delay && typeof options.delay == 'number') {
|
@@ -67,34 +69,28 @@
|
|
67
69
|
return options
|
68
70
|
}
|
69
71
|
|
70
|
-
, enter: function (
|
72
|
+
, enter: function (e) {
|
71
73
|
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
|
72
74
|
|
73
|
-
if (!self.options.delay || !self.options.delay.show)
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
}
|
81
|
-
}, self.options.delay.show)
|
82
|
-
}
|
75
|
+
if (!self.options.delay || !self.options.delay.show) return self.show()
|
76
|
+
|
77
|
+
clearTimeout(this.timeout)
|
78
|
+
self.hoverState = 'in'
|
79
|
+
this.timeout = setTimeout(function() {
|
80
|
+
if (self.hoverState == 'in') self.show()
|
81
|
+
}, self.options.delay.show)
|
83
82
|
}
|
84
83
|
|
85
|
-
, leave: function (
|
84
|
+
, leave: function (e) {
|
86
85
|
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
|
87
86
|
|
88
|
-
if (!self.options.delay || !self.options.delay.hide)
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
}
|
96
|
-
}, self.options.delay.hide)
|
97
|
-
}
|
87
|
+
if (!self.options.delay || !self.options.delay.hide) return self.hide()
|
88
|
+
|
89
|
+
clearTimeout(this.timeout)
|
90
|
+
self.hoverState = 'out'
|
91
|
+
this.timeout = setTimeout(function() {
|
92
|
+
if (self.hoverState == 'out') self.hide()
|
93
|
+
}, self.options.delay.hide)
|
98
94
|
}
|
99
95
|
|
100
96
|
, show: function () {
|
@@ -152,9 +148,20 @@
|
|
152
148
|
}
|
153
149
|
}
|
154
150
|
|
151
|
+
, isHTML: function(text) {
|
152
|
+
// html string detection logic adapted from jQuery
|
153
|
+
return typeof text != 'string'
|
154
|
+
|| ( text.charAt(0) === "<"
|
155
|
+
&& text.charAt( text.length - 1 ) === ">"
|
156
|
+
&& text.length >= 3
|
157
|
+
) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text)
|
158
|
+
}
|
159
|
+
|
155
160
|
, setContent: function () {
|
156
161
|
var $tip = this.tip()
|
157
|
-
|
162
|
+
, title = this.getTitle()
|
163
|
+
|
164
|
+
$tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title)
|
158
165
|
$tip.removeClass('fade in top bottom left right')
|
159
166
|
}
|
160
167
|
|
@@ -206,8 +213,6 @@
|
|
206
213
|
title = $e.attr('data-original-title')
|
207
214
|
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
|
208
215
|
|
209
|
-
title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
|
210
|
-
|
211
216
|
return title
|
212
217
|
}
|
213
218
|
|
@@ -259,12 +264,12 @@
|
|
259
264
|
|
260
265
|
$.fn.tooltip.defaults = {
|
261
266
|
animation: true
|
262
|
-
, delay: 0
|
263
|
-
, selector: false
|
264
267
|
, placement: 'top'
|
268
|
+
, selector: false
|
269
|
+
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
|
265
270
|
, trigger: 'hover'
|
266
271
|
, title: ''
|
267
|
-
,
|
272
|
+
, delay: 0
|
268
273
|
}
|
269
274
|
|
270
|
-
}(
|
275
|
+
}(window.jQuery);
|