compass_twitter_bootstrap 2.0.1.2 → 2.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (108) hide show
  1. data/README.md +17 -0
  2. data/build/convert.rb +2 -12
  3. data/lib/compass_twitter_bootstrap/version.rb +1 -1
  4. data/stylesheets/_compass_twitter_bootstrap.scss +2 -2
  5. data/stylesheets/_compass_twitter_bootstrap_awesome.scss +66 -0
  6. data/stylesheets/_compass_twitter_bootstrap_responsive.scss +14 -293
  7. data/stylesheets/compass_twitter_bootstrap/_accordion.scss +6 -1
  8. data/stylesheets/compass_twitter_bootstrap/_alerts.scss +3 -15
  9. data/stylesheets/compass_twitter_bootstrap/_breadcrumbs.scss +5 -3
  10. data/stylesheets/compass_twitter_bootstrap/_button-groups.scss +82 -39
  11. data/stylesheets/compass_twitter_bootstrap/_buttons.scss +38 -30
  12. data/stylesheets/compass_twitter_bootstrap/_carousel.scss +5 -5
  13. data/stylesheets/compass_twitter_bootstrap/_close.scss +13 -2
  14. data/stylesheets/compass_twitter_bootstrap/_code.scss +9 -9
  15. data/stylesheets/compass_twitter_bootstrap/_component-animations.scss +10 -8
  16. data/stylesheets/compass_twitter_bootstrap/_dropdowns.scss +62 -49
  17. data/stylesheets/compass_twitter_bootstrap/_font-awesome.scss +267 -0
  18. data/stylesheets/compass_twitter_bootstrap/_forms.scss +141 -77
  19. data/stylesheets/compass_twitter_bootstrap/_grid.scss +2 -5
  20. data/stylesheets/compass_twitter_bootstrap/_hero-unit.scss +4 -2
  21. data/stylesheets/compass_twitter_bootstrap/_labels-badges.scss +63 -0
  22. data/stylesheets/compass_twitter_bootstrap/_layouts.scss +3 -3
  23. data/stylesheets/compass_twitter_bootstrap/_mixins.scss +275 -255
  24. data/stylesheets/compass_twitter_bootstrap/_modals.scss +19 -12
  25. data/stylesheets/compass_twitter_bootstrap/_navbar.scss +146 -81
  26. data/stylesheets/compass_twitter_bootstrap/_navs.scss +77 -52
  27. data/stylesheets/compass_twitter_bootstrap/_pager.scss +8 -2
  28. data/stylesheets/compass_twitter_bootstrap/_pagination.scss +6 -5
  29. data/stylesheets/compass_twitter_bootstrap/_popovers.scss +9 -9
  30. data/stylesheets/compass_twitter_bootstrap/_progress-bars.scss +41 -19
  31. data/stylesheets/compass_twitter_bootstrap/_reset.scss +4 -4
  32. data/stylesheets/compass_twitter_bootstrap/_responsive-1200px-min.scss +26 -0
  33. data/stylesheets/compass_twitter_bootstrap/_responsive-767px-max.scss +149 -0
  34. data/stylesheets/compass_twitter_bootstrap/_responsive-768px-979px.scss +17 -0
  35. data/stylesheets/compass_twitter_bootstrap/_responsive-navbar.scss +146 -0
  36. data/stylesheets/compass_twitter_bootstrap/_responsive-utilities.scss +41 -0
  37. data/stylesheets/compass_twitter_bootstrap/_scaffolding.scss +4 -4
  38. data/stylesheets/compass_twitter_bootstrap/_sprites.scss +42 -9
  39. data/stylesheets/compass_twitter_bootstrap/_tables.scss +60 -34
  40. data/stylesheets/compass_twitter_bootstrap/_thumbnails.scss +18 -6
  41. data/stylesheets/compass_twitter_bootstrap/_tooltip.scss +7 -7
  42. data/stylesheets/compass_twitter_bootstrap/_type.scss +28 -11
  43. data/stylesheets/compass_twitter_bootstrap/_variables.scss +107 -9
  44. data/stylesheets/compass_twitter_bootstrap/_wells.scss +13 -2
  45. data/stylesheets_sass/_compass_twitter_bootstrap.sass +2 -2
  46. data/stylesheets_sass/_compass_twitter_bootstrap_awesome.sass +70 -0
  47. data/stylesheets_sass/_compass_twitter_bootstrap_responsive.sass +13 -224
  48. data/stylesheets_sass/compass_twitter_bootstrap/_accordion.sass +5 -1
  49. data/stylesheets_sass/compass_twitter_bootstrap/_alerts.sass +3 -14
  50. data/stylesheets_sass/compass_twitter_bootstrap/_breadcrumbs.sass +5 -3
  51. data/stylesheets_sass/compass_twitter_bootstrap/_button-groups.sass +73 -36
  52. data/stylesheets_sass/compass_twitter_bootstrap/_buttons.sass +39 -28
  53. data/stylesheets_sass/compass_twitter_bootstrap/_carousel.sass +5 -5
  54. data/stylesheets_sass/compass_twitter_bootstrap/_close.sass +12 -2
  55. data/stylesheets_sass/compass_twitter_bootstrap/_code.sass +10 -9
  56. data/stylesheets_sass/compass_twitter_bootstrap/_component-animations.sass +5 -5
  57. data/stylesheets_sass/compass_twitter_bootstrap/_dropdowns.sass +57 -47
  58. data/stylesheets_sass/compass_twitter_bootstrap/_font-awesome.sass +515 -0
  59. data/stylesheets_sass/compass_twitter_bootstrap/_forms.sass +140 -76
  60. data/stylesheets_sass/compass_twitter_bootstrap/_grid.sass +2 -5
  61. data/stylesheets_sass/compass_twitter_bootstrap/_hero-unit.sass +4 -2
  62. data/stylesheets_sass/compass_twitter_bootstrap/_labels-badges.sass +85 -0
  63. data/stylesheets_sass/compass_twitter_bootstrap/_layouts.sass +3 -3
  64. data/stylesheets_sass/compass_twitter_bootstrap/_mixins.sass +277 -260
  65. data/stylesheets_sass/compass_twitter_bootstrap/_modals.sass +19 -12
  66. data/stylesheets_sass/compass_twitter_bootstrap/_navbar.sass +138 -78
  67. data/stylesheets_sass/compass_twitter_bootstrap/_navs.sass +77 -51
  68. data/stylesheets_sass/compass_twitter_bootstrap/_pager.sass +8 -2
  69. data/stylesheets_sass/compass_twitter_bootstrap/_pagination.sass +6 -5
  70. data/stylesheets_sass/compass_twitter_bootstrap/_popovers.sass +9 -9
  71. data/stylesheets_sass/compass_twitter_bootstrap/_progress-bars.sass +44 -19
  72. data/stylesheets_sass/compass_twitter_bootstrap/_reset.sass +4 -3
  73. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-1200px-min.sass +17 -0
  74. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-767px-max.sass +115 -0
  75. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-768px-979px.sass +11 -0
  76. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-navbar.sass +115 -0
  77. data/stylesheets_sass/compass_twitter_bootstrap/_responsive-utilities.sass +56 -0
  78. data/stylesheets_sass/compass_twitter_bootstrap/_scaffolding.sass +4 -4
  79. data/stylesheets_sass/compass_twitter_bootstrap/_sprites.sass +70 -7
  80. data/stylesheets_sass/compass_twitter_bootstrap/_tables.sass +72 -34
  81. data/stylesheets_sass/compass_twitter_bootstrap/_thumbnails.sass +15 -5
  82. data/stylesheets_sass/compass_twitter_bootstrap/_tooltip.sass +7 -7
  83. data/stylesheets_sass/compass_twitter_bootstrap/_type.sass +27 -11
  84. data/stylesheets_sass/compass_twitter_bootstrap/_variables.sass +105 -8
  85. data/stylesheets_sass/compass_twitter_bootstrap/_wells.sass +11 -2
  86. data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
  87. data/vendor/assets/fonts/fontawesome-webfont.svg +175 -0
  88. data/vendor/assets/fonts/fontawesome-webfont.svgz +0 -0
  89. data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
  90. data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
  91. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  92. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  93. data/vendor/assets/javascripts/bootstrap-alert.js +28 -32
  94. data/vendor/assets/javascripts/bootstrap-all.js +12 -0
  95. data/vendor/assets/javascripts/bootstrap-button.js +32 -34
  96. data/vendor/assets/javascripts/bootstrap-carousel.js +33 -21
  97. data/vendor/assets/javascripts/bootstrap-collapse.js +47 -26
  98. data/vendor/assets/javascripts/bootstrap-dropdown.js +18 -10
  99. data/vendor/assets/javascripts/bootstrap-modal.js +25 -17
  100. data/vendor/assets/javascripts/bootstrap-popover.js +13 -10
  101. data/vendor/assets/javascripts/bootstrap-scrollspy.js +44 -18
  102. data/vendor/assets/javascripts/bootstrap-tab.js +12 -7
  103. data/vendor/assets/javascripts/bootstrap-tooltip.js +40 -35
  104. data/vendor/assets/javascripts/bootstrap-transition.js +30 -20
  105. data/vendor/assets/javascripts/bootstrap-typeahead.js +29 -15
  106. metadata +29 -9
  107. data/stylesheets/compass_twitter_bootstrap/_labels.scss +0 -32
  108. data/stylesheets_sass/compass_twitter_bootstrap/_labels.sass +0 -42
@@ -1,5 +1,5 @@
1
1
  /* ============================================================
2
- * bootstrap-dropdown.js v2.0.1
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 ( element ) {
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 ( e ) {
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
- !isActive && $parent.toggleClass('open')
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 ( option ) {
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').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
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
- }( window.jQuery );
100
+ }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* =========================================================
2
- * bootstrap-modal.js v2.0.1
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 ( content, options ) {
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 && that.$element.appendTo(document.body) //don't move modals dom position
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 ( e ) {
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( that ) {
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( callback ) {
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 ( option ) {
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
- }( window.jQuery );
218
+ }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-popover.js v2.0.1
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
- "use strict"
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')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
42
- $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](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 ( option ) {
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
- }( window.jQuery );
98
+ }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-scrollspy.js v2.0.1
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
- "use strict"
21
+ !function ($) {
22
+
23
+ "use strict"; // jshint ;_;
24
+
23
25
 
24
26
  /* SCROLLSPY CLASS DEFINITION
25
27
  * ========================== */
@@ -33,7 +35,7 @@
33
35
  this.selector = (this.options.target
34
36
  || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
35
37
  || '') + ' .nav li > a'
36
- this.$body = $('body').on('click.scroll.data-api', this.selector, process)
38
+ this.$body = $('body')
37
39
  this.refresh()
38
40
  this.process()
39
41
  }
@@ -43,25 +45,43 @@
43
45
  constructor: ScrollSpy
44
46
 
45
47
  , refresh: function () {
46
- this.targets = this.$body
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 href = $(this).attr('href')
50
- return /^#\w/.test(href) && $(href).length ? href : null
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.$body
79
- .find(this.selector).parent('.active')
99
+ $(this.selector)
100
+ .parent('.active')
80
101
  .removeClass('active')
81
102
 
82
- active = this.$body
83
- .find(this.selector + '[href="' + target + '"]')
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 ( active.parent('.dropdown-menu') ) {
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
- }( window.jQuery );
151
+ }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================
2
- * bootstrap-tab.js v2.0.1
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
- $this.trigger({
53
- type: 'show'
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
- }( window.jQuery );
135
+ }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-tooltip.js v2.0.1
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
- "use strict"
22
+ !function ($) {
23
+
24
+ "use strict"; // jshint ;_;
25
+
24
26
 
25
27
  /* TOOLTIP PUBLIC CLASS DEFINITION
26
28
  * =============================== */
27
29
 
28
- var Tooltip = function ( element, options ) {
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 ( type, element, options ) {
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 ( options ) {
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 ( e ) {
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
- self.show()
75
- } else {
76
- self.hoverState = 'in'
77
- setTimeout(function() {
78
- if (self.hoverState == 'in') {
79
- self.show()
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 ( e ) {
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
- self.hide()
90
- } else {
91
- self.hoverState = 'out'
92
- setTimeout(function() {
93
- if (self.hoverState == 'out') {
94
- self.hide()
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
- $tip.find('.tooltip-inner').html(this.getTitle())
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
- , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
272
+ , delay: 0
268
273
  }
269
274
 
270
- }( window.jQuery );
275
+ }(window.jQuery);