anjlab-bootstrap-rails 2.3.1.2 → 3.0.0.0.alpha1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (103) hide show
  1. checksums.yaml +4 -4
  2. data/.gitmodules +3 -0
  3. data/Rakefile +42 -26
  4. data/lib/bootstrap-rails.rb +5 -6
  5. data/lib/bootstrap-rails/engine.rb +2 -9
  6. data/lib/bootstrap-rails/version.rb +1 -1
  7. data/test/test_helper.rb +2 -2
  8. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.eot +0 -0
  9. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.otf +0 -0
  10. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.svg +175 -0
  11. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.ttf +0 -0
  12. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.woff +0 -0
  13. data/vendor/assets/javascripts/twitter/bootstrap.js +4 -5
  14. data/vendor/assets/javascripts/twitter/bootstrap/affix.js +50 -47
  15. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +32 -35
  16. data/vendor/assets/javascripts/twitter/bootstrap/button.js +37 -37
  17. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +123 -127
  18. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +81 -95
  19. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +61 -81
  20. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +146 -151
  21. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +53 -58
  22. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +99 -105
  23. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +70 -81
  24. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +246 -254
  25. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +24 -37
  26. data/vendor/assets/stylesheets/twitter/bootstrap.scss +1 -1
  27. data/vendor/{frameworks/twitter/bootstrap/accordion.scss → assets/stylesheets/twitter/bootstrap/_accordion.scss} +2 -2
  28. data/vendor/assets/stylesheets/twitter/bootstrap/_alerts.scss +92 -0
  29. data/vendor/assets/stylesheets/twitter/bootstrap/_badges.scss +58 -0
  30. data/vendor/assets/stylesheets/twitter/bootstrap/_bootstrap.scss +64 -0
  31. data/vendor/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +28 -0
  32. data/vendor/assets/stylesheets/twitter/bootstrap/_button-groups.scss +170 -0
  33. data/vendor/assets/stylesheets/twitter/bootstrap/_buttons.scss +160 -0
  34. data/vendor/assets/stylesheets/twitter/bootstrap/_carousel.scss +191 -0
  35. data/vendor/{frameworks/twitter/bootstrap/close.scss → assets/stylesheets/twitter/bootstrap/_close.scss} +7 -6
  36. data/vendor/{frameworks/twitter/bootstrap/code.scss → assets/stylesheets/twitter/bootstrap/_code.scss} +14 -14
  37. data/vendor/{frameworks/twitter/bootstrap/component-animations.scss → assets/stylesheets/twitter/bootstrap/_component-animations.scss} +1 -0
  38. data/vendor/{frameworks/twitter/bootstrap/dropdowns.scss → assets/stylesheets/twitter/bootstrap/_dropdowns.scss} +46 -57
  39. data/vendor/assets/stylesheets/twitter/bootstrap/_forms.scss +464 -0
  40. data/vendor/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +200 -0
  41. data/vendor/assets/stylesheets/twitter/bootstrap/_grid.scss +65 -0
  42. data/vendor/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +32 -0
  43. data/vendor/assets/stylesheets/twitter/bootstrap/_labels.scss +70 -0
  44. data/vendor/assets/stylesheets/twitter/bootstrap/_list-group.scss +96 -0
  45. data/vendor/{frameworks/twitter/bootstrap/media.scss → assets/stylesheets/twitter/bootstrap/_media.scss} +0 -1
  46. data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss +510 -0
  47. data/vendor/assets/stylesheets/twitter/bootstrap/_modals.scss +137 -0
  48. data/vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss +356 -0
  49. data/vendor/assets/stylesheets/twitter/bootstrap/_navs.scss +249 -0
  50. data/vendor/assets/stylesheets/twitter/bootstrap/_normalize.scss +396 -0
  51. data/vendor/assets/stylesheets/twitter/bootstrap/_pager.scss +54 -0
  52. data/vendor/assets/stylesheets/twitter/bootstrap/_pagination.scss +87 -0
  53. data/vendor/assets/stylesheets/twitter/bootstrap/_panels.scss +96 -0
  54. data/vendor/{frameworks/twitter/bootstrap/popovers.scss → assets/stylesheets/twitter/bootstrap/_popovers.scss} +32 -32
  55. data/vendor/assets/stylesheets/twitter/bootstrap/_print.scss +74 -0
  56. data/vendor/{frameworks/twitter/bootstrap/progress-bars.scss → assets/stylesheets/twitter/bootstrap/_progress-bars.scss} +40 -44
  57. data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +77 -0
  58. data/vendor/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +83 -0
  59. data/vendor/assets/stylesheets/twitter/bootstrap/_tables.scss +242 -0
  60. data/vendor/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +43 -0
  61. data/vendor/{frameworks/twitter/bootstrap/tooltip.scss → assets/stylesheets/twitter/bootstrap/_tooltip.scss} +20 -19
  62. data/vendor/assets/stylesheets/twitter/bootstrap/_type.scss +253 -0
  63. data/vendor/{frameworks/twitter/bootstrap/utilities.scss → assets/stylesheets/twitter/bootstrap/_utilities.scss} +17 -5
  64. data/vendor/assets/stylesheets/twitter/bootstrap/_variables.scss +416 -0
  65. data/vendor/{frameworks/twitter/bootstrap/wells.scss → assets/stylesheets/twitter/bootstrap/_wells.scss} +5 -5
  66. metadata +49 -53
  67. data/lib/bootstrap-rails/ie_hex_str.rb +0 -16
  68. data/test/ie_hex_str_test.rb +0 -26
  69. data/vendor/assets/images/twitter/glyphicons-halflings-white.png +0 -0
  70. data/vendor/assets/images/twitter/glyphicons-halflings.png +0 -0
  71. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +0 -335
  72. data/vendor/assets/stylesheets/twitter/bootstrap-responsive.scss +0 -1
  73. data/vendor/frameworks/twitter/bootstrap.scss +0 -1
  74. data/vendor/frameworks/twitter/bootstrap/alerts.scss +0 -79
  75. data/vendor/frameworks/twitter/bootstrap/bootstrap.scss +0 -63
  76. data/vendor/frameworks/twitter/bootstrap/breadcrumbs.scss +0 -24
  77. data/vendor/frameworks/twitter/bootstrap/button-groups.scss +0 -230
  78. data/vendor/frameworks/twitter/bootstrap/buttons.scss +0 -228
  79. data/vendor/frameworks/twitter/bootstrap/carousel.scss +0 -158
  80. data/vendor/frameworks/twitter/bootstrap/forms.scss +0 -690
  81. data/vendor/frameworks/twitter/bootstrap/grid.scss +0 -21
  82. data/vendor/frameworks/twitter/bootstrap/hero-unit.scss +0 -25
  83. data/vendor/frameworks/twitter/bootstrap/labels-badges.scss +0 -83
  84. data/vendor/frameworks/twitter/bootstrap/layouts.scss +0 -16
  85. data/vendor/frameworks/twitter/bootstrap/mixins.scss +0 -704
  86. data/vendor/frameworks/twitter/bootstrap/modals.scss +0 -95
  87. data/vendor/frameworks/twitter/bootstrap/navbar.scss +0 -496
  88. data/vendor/frameworks/twitter/bootstrap/navs.scss +0 -409
  89. data/vendor/frameworks/twitter/bootstrap/pager.scss +0 -43
  90. data/vendor/frameworks/twitter/bootstrap/pagination.scss +0 -123
  91. data/vendor/frameworks/twitter/bootstrap/reset.scss +0 -216
  92. data/vendor/frameworks/twitter/bootstrap/responsive-1200px-min.scss +0 -28
  93. data/vendor/frameworks/twitter/bootstrap/responsive-767px-max.scss +0 -189
  94. data/vendor/frameworks/twitter/bootstrap/responsive-768px-979px.scss +0 -19
  95. data/vendor/frameworks/twitter/bootstrap/responsive-navbar.scss +0 -189
  96. data/vendor/frameworks/twitter/bootstrap/responsive-utilities.scss +0 -59
  97. data/vendor/frameworks/twitter/bootstrap/responsive.scss +0 -48
  98. data/vendor/frameworks/twitter/bootstrap/scaffolding.scss +0 -53
  99. data/vendor/frameworks/twitter/bootstrap/sprites.scss +0 -197
  100. data/vendor/frameworks/twitter/bootstrap/tables.scss +0 -235
  101. data/vendor/frameworks/twitter/bootstrap/thumbnails.scss +0 -53
  102. data/vendor/frameworks/twitter/bootstrap/type.scss +0 -246
  103. data/vendor/frameworks/twitter/bootstrap/variables.scss +0 -295
@@ -1,7 +1,7 @@
1
- /* =============================================================
2
- * bootstrap-scrollspy.js v2.3.1
1
+ /* ========================================================================
2
+ * Bootstrap: scrollspy.js v3.0.0
3
3
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
4
- * =============================================================
4
+ * ========================================================================
5
5
  * Copyright 2012 Twitter, Inc.
6
6
  *
7
7
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,133 +15,127 @@
15
15
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
- * ============================================================== */
18
+ * ======================================================================== */
19
19
 
20
20
 
21
- !function ($) {
21
+ +function ($) { "use strict";
22
22
 
23
- "use strict"; // jshint ;_;
24
-
25
-
26
- /* SCROLLSPY CLASS DEFINITION
27
- * ========================== */
23
+ // SCROLLSPY CLASS DEFINITION
24
+ // ==========================
28
25
 
29
26
  function ScrollSpy(element, options) {
30
- var process = $.proxy(this.process, this)
31
- , $element = $(element).is('body') ? $(window) : $(element)
32
- , href
33
- this.options = $.extend({}, $.fn.scrollspy.defaults, options)
27
+ var href
28
+ var process = $.proxy(this.process, this)
29
+ var $element = $(element).is('body') ? $(window) : $(element)
30
+
31
+ this.$body = $('body')
34
32
  this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
35
- this.selector = (this.options.target
33
+ this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
34
+ this.selector = (this.options.target
36
35
  || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
37
36
  || '') + ' .nav li > a'
38
- this.$body = $('body')
37
+ this.offsets = $([])
38
+ this.targets = $([])
39
+ this.activeTarget = null
40
+
39
41
  this.refresh()
40
42
  this.process()
41
43
  }
42
44
 
43
- ScrollSpy.prototype = {
44
-
45
- constructor: ScrollSpy
46
-
47
- , refresh: function () {
48
- var self = this
49
- , $targets
50
-
51
- this.offsets = $([])
52
- this.targets = $([])
53
-
54
- $targets = this.$body
55
- .find(this.selector)
56
- .map(function () {
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 + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), 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])
68
- })
69
- }
70
-
71
- , process: function () {
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()
75
- , offsets = this.offsets
76
- , targets = this.targets
77
- , activeTarget = this.activeTarget
78
- , i
79
-
80
- if (scrollTop >= maxScroll) {
81
- return activeTarget != (i = targets.last()[0])
82
- && this.activate ( i )
83
- }
84
-
85
- for (i = offsets.length; i--;) {
86
- activeTarget != targets[i]
87
- && scrollTop >= offsets[i]
88
- && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
89
- && this.activate( targets[i] )
90
- }
91
- }
92
-
93
- , activate: function (target) {
94
- var active
95
- , selector
96
-
97
- this.activeTarget = target
98
-
99
- $(this.selector)
100
- .parent('.active')
101
- .removeClass('active')
102
-
103
- selector = this.selector
104
- + '[data-target="' + target + '"],'
105
- + this.selector + '[href="' + target + '"]'
106
-
107
- active = $(selector)
108
- .parent('li')
109
- .addClass('active')
110
-
111
- if (active.parent('.dropdown-menu').length) {
112
- active = active.closest('li.dropdown').addClass('active')
113
- }
114
-
115
- active.trigger('activate')
116
- }
45
+ ScrollSpy.DEFAULTS = {
46
+ offset: 10
47
+ }
48
+
49
+ ScrollSpy.prototype.refresh = function () {
50
+ this.offsets = $([])
51
+ this.targets = $([])
52
+
53
+ var self = this
54
+ var $targets = this.$body
55
+ .find(this.selector)
56
+ .map(function () {
57
+ var $el = $(this)
58
+ var href = $el.data('target') || $el.attr('href')
59
+ var $href = /^#\w/.test(href) && $(href)
60
+
61
+ return ($href
62
+ && $href.length
63
+ && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
64
+ })
65
+ .sort(function (a, b) { return a[0] - b[0] })
66
+ .each(function () {
67
+ self.offsets.push(this[0])
68
+ self.targets.push(this[1])
69
+ })
70
+ }
117
71
 
72
+ ScrollSpy.prototype.process = function () {
73
+ var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
74
+ var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
75
+ var maxScroll = scrollHeight - this.$scrollElement.height()
76
+ var offsets = this.offsets
77
+ var targets = this.targets
78
+ var activeTarget = this.activeTarget
79
+ var i
80
+
81
+ if (scrollTop >= maxScroll) {
82
+ return activeTarget != (i = targets.last()[0]) && this.activate(i)
83
+ }
84
+
85
+ for (i = offsets.length; i--;) {
86
+ activeTarget != targets[i]
87
+ && scrollTop >= offsets[i]
88
+ && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
89
+ && this.activate( targets[i] )
90
+ }
118
91
  }
119
92
 
93
+ ScrollSpy.prototype.activate = function (target) {
94
+ this.activeTarget = target
95
+
96
+ $(this.selector)
97
+ .parents('.active')
98
+ .removeClass('active')
99
+
100
+ var selector = this.selector
101
+ + '[data-target="' + target + '"],'
102
+ + this.selector + '[href="' + target + '"]'
120
103
 
121
- /* SCROLLSPY PLUGIN DEFINITION
122
- * =========================== */
104
+ var active = $(selector)
105
+ .parents('li')
106
+ .addClass('active')
107
+
108
+ if (active.parent('.dropdown-menu').length) {
109
+ active = active
110
+ .closest('li.dropdown')
111
+ .addClass('active')
112
+ }
113
+
114
+ active.trigger('activate')
115
+ }
116
+
117
+
118
+ // SCROLLSPY PLUGIN DEFINITION
119
+ // ===========================
123
120
 
124
121
  var old = $.fn.scrollspy
125
122
 
126
123
  $.fn.scrollspy = function (option) {
127
124
  return this.each(function () {
128
- var $this = $(this)
129
- , data = $this.data('scrollspy')
130
- , options = typeof option == 'object' && option
131
- if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
125
+ var $this = $(this)
126
+ var data = $this.data('bs.scrollspy')
127
+ var options = typeof option == 'object' && option
128
+
129
+ if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
132
130
  if (typeof option == 'string') data[option]()
133
131
  })
134
132
  }
135
133
 
136
134
  $.fn.scrollspy.Constructor = ScrollSpy
137
135
 
138
- $.fn.scrollspy.defaults = {
139
- offset: 10
140
- }
141
-
142
136
 
143
- /* SCROLLSPY NO CONFLICT
144
- * ===================== */
137
+ // SCROLLSPY NO CONFLICT
138
+ // =====================
145
139
 
146
140
  $.fn.scrollspy.noConflict = function () {
147
141
  $.fn.scrollspy = old
@@ -149,8 +143,8 @@
149
143
  }
150
144
 
151
145
 
152
- /* SCROLLSPY DATA-API
153
- * ================== */
146
+ // SCROLLSPY DATA-API
147
+ // ==================
154
148
 
155
149
  $(window).on('load', function () {
156
150
  $('[data-spy="scroll"]').each(function () {
@@ -159,4 +153,4 @@
159
153
  })
160
154
  })
161
155
 
162
- }(window.jQuery);
156
+ }(window.jQuery);
@@ -1,7 +1,7 @@
1
- /* ========================================================
2
- * bootstrap-tab.js v2.3.1
1
+ /* ========================================================================
2
+ * Bootstrap: tab.js v3.0.0
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tabs
4
- * ========================================================
4
+ * ========================================================================
5
5
  * Copyright 2012 Twitter, Inc.
6
6
  *
7
7
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,108 +15,97 @@
15
15
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
- * ======================================================== */
18
+ * ======================================================================== */
19
19
 
20
20
 
21
- !function ($) {
21
+ +function ($) { "use strict";
22
22
 
23
- "use strict"; // jshint ;_;
24
-
25
-
26
- /* TAB CLASS DEFINITION
27
- * ==================== */
23
+ // TAB CLASS DEFINITION
24
+ // ====================
28
25
 
29
26
  var Tab = function (element) {
30
27
  this.element = $(element)
31
28
  }
32
29
 
33
- Tab.prototype = {
34
-
35
- constructor: Tab
36
-
37
- , show: function () {
38
- var $this = this.element
39
- , $ul = $this.closest('ul:not(.dropdown-menu)')
40
- , selector = $this.attr('data-target')
41
- , previous
42
- , $target
43
- , e
44
-
45
- if (!selector) {
46
- selector = $this.attr('href')
47
- selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
48
- }
30
+ Tab.prototype.show = function () {
31
+ var $this = this.element
32
+ var $ul = $this.closest('ul:not(.dropdown-menu)')
33
+ var selector = $this.attr('data-target')
49
34
 
50
- if ( $this.parent('li').hasClass('active') ) return
35
+ if (!selector) {
36
+ selector = $this.attr('href')
37
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
38
+ }
51
39
 
52
- previous = $ul.find('.active:last a')[0]
40
+ if ($this.parent('li').hasClass('active')) return
53
41
 
54
- e = $.Event('show', {
55
- relatedTarget: previous
56
- })
42
+ var previous = $ul.find('.active:last a')[0]
43
+ var e = $.Event('show.bs.tab', {
44
+ relatedTarget: previous
45
+ })
57
46
 
58
- $this.trigger(e)
47
+ $this.trigger(e)
59
48
 
60
- if (e.isDefaultPrevented()) return
49
+ if (e.isDefaultPrevented()) return
61
50
 
62
- $target = $(selector)
51
+ var $target = $(selector)
63
52
 
64
- this.activate($this.parent('li'), $ul)
65
- this.activate($target, $target.parent(), function () {
66
- $this.trigger({
67
- type: 'shown'
68
- , relatedTarget: previous
69
- })
53
+ this.activate($this.parent('li'), $ul)
54
+ this.activate($target, $target.parent(), function () {
55
+ $this.trigger({
56
+ type: 'shown.bs.tab'
57
+ , relatedTarget: previous
70
58
  })
71
- }
72
-
73
- , activate: function ( element, container, callback) {
74
- var $active = container.find('> .active')
75
- , transition = callback
76
- && $.support.transition
77
- && $active.hasClass('fade')
78
-
79
- function next() {
80
- $active
81
- .removeClass('active')
82
- .find('> .dropdown-menu > .active')
83
- .removeClass('active')
84
-
85
- element.addClass('active')
86
-
87
- if (transition) {
88
- element[0].offsetWidth // reflow for transition
89
- element.addClass('in')
90
- } else {
91
- element.removeClass('fade')
92
- }
93
-
94
- if ( element.parent('.dropdown-menu') ) {
95
- element.closest('li.dropdown').addClass('active')
96
- }
59
+ })
60
+ }
97
61
 
98
- callback && callback()
62
+ Tab.prototype.activate = function (element, container, callback) {
63
+ var $active = container.find('> .active')
64
+ var transition = callback
65
+ && $.support.transition
66
+ && $active.hasClass('fade')
67
+
68
+ function next() {
69
+ $active
70
+ .removeClass('active')
71
+ .find('> .dropdown-menu > .active')
72
+ .removeClass('active')
73
+
74
+ element.addClass('active')
75
+
76
+ if (transition) {
77
+ element[0].offsetWidth // reflow for transition
78
+ element.addClass('in')
79
+ } else {
80
+ element.removeClass('fade')
99
81
  }
100
82
 
101
- transition ?
102
- $active.one($.support.transition.end, next) :
103
- next()
83
+ if (element.parent('.dropdown-menu')) {
84
+ element.closest('li.dropdown').addClass('active')
85
+ }
104
86
 
105
- $active.removeClass('in')
87
+ callback && callback()
106
88
  }
89
+
90
+ transition ?
91
+ $active.one($.support.transition.end, next) :
92
+ next()
93
+
94
+ $active.removeClass('in')
107
95
  }
108
96
 
109
97
 
110
- /* TAB PLUGIN DEFINITION
111
- * ===================== */
98
+ // TAB PLUGIN DEFINITION
99
+ // =====================
112
100
 
113
101
  var old = $.fn.tab
114
102
 
115
103
  $.fn.tab = function ( option ) {
116
104
  return this.each(function () {
117
105
  var $this = $(this)
118
- , data = $this.data('tab')
119
- if (!data) $this.data('tab', (data = new Tab(this)))
106
+ var data = $this.data('bs.tab')
107
+
108
+ if (!data) $this.data('bs.tab', (data = new Tab(this)))
120
109
  if (typeof option == 'string') data[option]()
121
110
  })
122
111
  }
@@ -124,8 +113,8 @@
124
113
  $.fn.tab.Constructor = Tab
125
114
 
126
115
 
127
- /* TAB NO CONFLICT
128
- * =============== */
116
+ // TAB NO CONFLICT
117
+ // ===============
129
118
 
130
119
  $.fn.tab.noConflict = function () {
131
120
  $.fn.tab = old
@@ -133,12 +122,12 @@
133
122
  }
134
123
 
135
124
 
136
- /* TAB DATA-API
137
- * ============ */
125
+ // TAB DATA-API
126
+ // ============
138
127
 
139
- $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
128
+ $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
140
129
  e.preventDefault()
141
130
  $(this).tab('show')
142
131
  })
143
132
 
144
- }(window.jQuery);
133
+ }(window.jQuery);