Chris Rebert
f11aa31023
Merge pull request #10519 from zba/master
...
changed attr('data-target') to data('target');
2013-10-14 19:14:58 -07:00
Zlatan Vasović
62c905f5bc
Remove [type]
...
type="text/css" isn't needed
2013-10-09 09:45:05 +02:00
Alexander Prinzhorn
12a3bb31f8
Only preventDefault on click on [data-toggle="modal"] when the element is a link
...
In it's current state Bootstrap always prevents the default action for a click
event on `[data-toggle="modal"]` elements
(see https://github.com/twbs/bootstrap/blob/master/js/modal.js#L233 ).
Instead this should only happen when the element is a link.
2013-09-27 11:32:06 +02:00
Travesty3
1c1850f63e
Add 'collapse' class back after expanding
2013-09-25 08:59:01 -04:00
Jochen Berger
f350d1ba3d
don't create new Tooltip/Popover objects just to destroy them immediately
2013-09-23 15:14:37 +02:00
XhmikosR
3c0489102e
Sort by name.
2013-09-18 20:36:17 +03:00
Alexey
7ee2b6a976
changed attr('data-target') to data('target');
...
this will extend js interface, to be possible to setup targets for tabs as
var content=$('<div class="tab-pane">',{text: 'content'});
var tab=('<li>',{html: $('<a>',{text: 'Main options'})}).addClass('active').data({target: $main,toggle: 'tab'}).appendTo(tabs);
2013-09-08 04:49:27 +03:00
Aleksey V. Zapparov
626cef9fa4
Pass $element to offset top/bottom calc funcs
...
At the moment to make dynamic top offset calculator on multiple elements, one would write:
``` javascript
$('.my-affix').each(function () {
var $el = $(this);
$el.affix({
offset: {
top: function () { return $el.offset().top; }
}
});
})
```
This patch will allow to:
``` javascript
$('.my-affix').affix({
offset: {
top: function ($el) { return $el.offset().top; }
}
});
```
2013-09-02 03:24:27 +02:00
Roland Warmerdam
ed1bd2b150
carousel: correctly reset when the slide event is prevented
2013-08-31 18:03:09 +12:00
Martin Hansen
6d3ad5ed7f
deleted files not used anymore after transition to grunt-contrib-qunit
2013-08-30 21:39:48 +02:00
Lukasz Fiszer
0adb4e35f0
Fix hidden.bs.tooltip and shown.bs.tooltip events firing too early in tooltip.js
...
* events fire only after the CSS animation is completed
* this fixes also events in popover.js (as it inherits from tooltip.js)
2013-08-26 20:57:47 +02:00
Josh Dague
f140084f2b
Don't explicitly reference global jQuery
...
Removes `window.jQuery` in favor of `jQuery`, fixes #10038
2013-08-22 14:50:15 -04:00
fat
734b6acf13
add small fix for tooltip consistency + fix customizer syntax issue
2013-08-17 20:28:58 -07:00
fat
4696565044
fixes #9745
2013-08-17 16:18:26 -07:00
fat
63ac9e354f
fixes #9674
2013-08-17 16:13:48 -07:00
fat
c0eabdda9f
fixes #9543
2013-08-17 16:11:05 -07:00
fat
d754e6564d
add some crap
2013-08-17 15:54:42 -07:00
fat
1d53dd31f5
add role=menu to html
2013-08-17 15:48:29 -07:00
fat
a10ec62f63
fixes #9579
2013-08-17 15:05:59 -07:00
fat
712b89ed4e
fixes #9362
2013-08-17 14:24:38 -07:00
fat
5e89f71ab2
fix for #8768
2013-08-17 13:14:19 -07:00
Mark Otto
237640c706
Drop the accordion for the panel
...
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
2013-08-12 23:36:25 -07:00
Jacob Thornton
92c2ad98e7
fixes #8983
2013-08-11 15:41:06 -07:00
Jacob Thornton
89b3cb0dac
fixes #9318
2013-08-11 15:17:04 -07:00
Jacob Thornton
bf2ab457ea
fix comment in tooltip
2013-08-11 14:59:39 -07:00
Jacob Thornton
6393a78bf0
fixes #9279
2013-08-11 14:32:32 -07:00
Jacob Thornton
1abb7947c2
fixes #9222
2013-08-10 14:09:05 -07:00
Jacob Thornton
a4f0e8d37a
fixes #9111
2013-08-10 13:35:20 -07:00
Jacob Thornton
dbed9da774
fixes #6159
2013-08-09 00:16:47 -07:00
Chris Rebert
f86f6ee955
fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack
...
fixes typo introduced in 2b6ec38987
2013-08-08 13:31:22 -07:00
Jacob
d22bd3a660
Merge pull request #9089 from jdiamond/3.0.0-wip
...
accordion's data-parent can't contain dots
2013-08-07 23:37:05 -07:00
Braden Whitten
f816a18f79
Fix spacing after '='
...
Just added a space after a function definition to tidy up the code.
2013-08-06 17:02:57 -04:00
Mark Otto
f266595092
Fixes #9150 : Hide popover titles in IE8
...
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
2013-08-06 11:18:12 -07:00
Jason Diamond
fb57eda268
use quotes to allow dots in data-parent
2013-08-04 23:59:57 -07:00
Jason Diamond
700e742a9c
failing test for dot in data-parent
2013-08-04 23:59:30 -07:00
Chris Rebert
180034a4b4
tooltip.js: add missing space
2013-08-04 17:36:08 -07:00
fat
2b6ec38987
fixes #8880
2013-08-04 17:22:49 -07:00
fat
f6cec812a6
fixes #8957
2013-08-02 15:13:12 -07:00
Jacob Thornton
7a3c61ee33
fixes #8892
2013-07-31 22:57:00 -07:00
Jacob Thornton
ccd4c9d7b5
fixes #8864
2013-07-31 22:28:05 -07:00
Cesidio Di Landa
3696530aaf
Removed trailing whitespaces
...
Changed hard tabs to soft tabs
2013-07-31 18:11:11 +02:00
fat
c54b8adb85
fixes #8814
2013-07-30 13:33:56 -07:00
fat
5ee2a221ca
fixes #8816
2013-07-30 13:31:57 -07:00
liuyl
270316f140
fix transition end
2013-07-29 20:23:01 +08:00
Jacob Thornton
a31c5cea42
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-28 22:16:17 -07:00
Jacob Thornton
e5a7af36d5
fixes #8703
2013-07-28 22:14:43 -07:00
Chris Rebert
9c672c6b20
get jshint close to passing by updating .jshintrc settings
...
I don't agree with these personally, but they jive with BS/@fat's JS code style.
The remaining jshint complaints are things that really actually should get fixed.
2013-07-27 21:56:44 -07:00
fat
cfa4ab90f3
fix scrollspy for window *and* children
2013-07-26 22:24:51 -07:00
fat
38044e55ae
rebuild + fix #2539
2013-07-26 20:44:35 -07:00
fat
e2d4cf5f68
change how collapse works - collapse, collapsing, and in
2013-07-26 20:34:39 -07:00
John-Philip Johansson
0d33455ef4
Replace Makefile with GruntJS
...
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess
Rebased by @cvrebert
2013-07-26 00:39:14 -07:00
fat
f5f04ae4a0
fix affix…
2013-07-25 23:30:13 -07:00
fat
0190128ebc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 21:34:02 -07:00
fat
15d9c82fc5
fix collapse event #8596
2013-07-25 21:33:26 -07:00
Jacob
f1ddf7681c
Merge pull request #8419 from hollensteiner/3.0.0-wip
...
Replace position() with offset() in scrollspy.js
2013-07-25 21:19:57 -07:00
Chris Rebert
90fb40b707
twbs ALL the links
2013-07-25 12:24:13 -07:00
Jacob Thornton
e9c83647af
fixes #8568 -- account for margins in offset
2013-07-24 20:57:26 -07:00
Jacob Thornton
aad910465c
fixes #8569
2013-07-24 20:21:23 -07:00
Jacob Thornton
eaefed517a
fixes #8399 w/ tests
2013-07-24 20:10:16 -07:00
Jacob Thornton
217eb988b8
add placement auto for tooltips + tests… kinda sad about this doe
2013-07-23 23:50:23 -07:00
Jacob Thornton
6841c50968
fixes #7814
2013-07-23 22:59:09 -07:00
Jacob Thornton
72d2661ff0
fixes #8232
2013-07-23 20:53:12 -07:00
Jacob Thornton
faa00629c4
add additional carousel test
2013-07-23 18:56:00 -07:00
Jacob Thornton
68e87183a0
fixes #8134
2013-07-23 18:54:00 -07:00
Jacob Thornton
f1009c19b3
revert collapse change + add emulateTransitionEvent to catch dead css transitions
2013-07-23 18:44:08 -07:00
Jacob Thornton
43e5e90a6d
shown.bs.modal fix
2013-07-23 17:32:20 -07:00
Jacob Thornton
7b12a0dcbc
fixes #7970
2013-07-23 17:23:02 -07:00
fat
4b40ee692d
cleaner way of preventing double click events + clean up tests for jshint
2013-07-18 01:07:11 -07:00
fat
37e899d766
get button js working with actual form elements p cooll
2013-07-18 00:59:31 -07:00
fat
b13eecaeec
fixes #7880
2013-07-17 23:52:29 -07:00
fat
59f847e8ee
fixes #7777
2013-07-17 23:30:05 -07:00
fat
8cf04911db
fixes #7776
2013-07-17 23:25:26 -07:00
fat
451acb42db
fixes #7755
2013-07-17 23:15:50 -07:00
fat
57768d7ea9
fix #7660
2013-07-17 23:01:33 -07:00
fat
18d23b892c
rebuild js + fixes #7583
2013-07-17 21:35:28 -07:00
fat
2cccc0889f
make sure triggering element is visible before focusing #7521
2013-07-17 21:30:38 -07:00
fat
a7a9a14379
fix @muan's unit test ;)
2013-07-17 21:17:39 -07:00
fat
102df4ff33
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat
eb3333a612
fix #7000
2013-07-17 21:08:50 -07:00
fat
392bf0c9c9
fixes #6691
2013-07-17 20:29:41 -07:00
fat
13cad5061d
maybe fix this old ass issue #5973
2013-07-17 19:28:43 -07:00
ClausH
0a72530429
Replace position with offset
2013-07-08 12:02:31 +02:00
Mu-An Chiou
55fa1acbd6
Tooltip: apply position class before positioning
2013-06-28 11:05:38 +01:00
Jacob
d23800c828
Merge pull request #7424 from sody/3.0.0-wip
...
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class.
2013-06-27 22:36:33 -07:00
fat
b0da97588e
fixes #6982
2013-06-27 19:19:22 -07:00
Mark Otto
2aec6dae59
Fixes #7730 : Better hiding of empty titles in popovers
...
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.
/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Ivan Khalopik
e138b0df3a
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
2013-06-10 10:31:51 +03:00
Robert Burns
cc684750e5
Fix for carousel indicators
2013-06-01 08:15:40 -04:00
fat
f5ce66177b
fix event binding in modal.js
2013-05-29 11:24:00 -04:00
fat
9257bdc097
fixes #7163
2013-05-27 12:45:13 -07:00
Ivan Khalopik
3285f4c306
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
...
Conflicts:
js/bootstrap-collapse.js
2013-05-27 11:06:31 +03:00
Jacob Thornton
7cbb1c0452
add data-ride=carousel support for starting carousel on load
2013-05-25 00:16:52 -07:00
Jacob Thornton
e424b3879c
fixes #4781
2013-05-24 23:53:44 -07:00
Jacob Thornton
f3e45c3778
add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things
2013-05-24 23:15:04 -07:00
Mark Otto
432d417ade
fixes #6898 : typo in modal test
2013-05-22 23:17:39 -07:00
fat
e7b4fedee8
remove 3rd arg from $.each call
2013-05-22 15:18:30 -07:00
Jacob Thornton
ccfa989898
upgrade jshint to 2.1.2 for anton <3
2013-05-21 19:31:51 -07:00
fat
140ef2320b
change namespace back to dot notation and someother js shizzle
2013-05-16 20:19:51 -07:00
fat
5ab72f7687
fix tooltip defaults
2013-05-16 18:45:53 -07:00
fat
b239542a5e
carousel bug with data
2013-05-16 18:21:42 -07:00
fat
f37b351288
only overlay dropdowns for mobile
2013-05-16 18:15:34 -07:00
fat
a72d0d6e3a
fix tests
2013-05-16 17:44:50 -07:00
fat
19de2e8603
add bs- prefix to tooltip
2013-05-16 17:19:23 -07:00
fat
149ecd21bf
straight trash wang
2013-05-16 17:18:15 -07:00
fat
92245e8bc7
change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click
2013-05-16 12:50:06 -07:00
fat
bdbd268cb9
update collapse js style
2013-05-16 11:20:18 -07:00
fat
14651035de
a bunch javascript junk
2013-05-16 11:06:30 -07:00
Ivan Khalopik
3c7a43a1f3
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
...
Conflicts:
js/tests/unit/bootstrap-collapse.js
2013-05-07 15:16:45 +03:00
Stephen Edgar
1b132ddcb4
'js' folder .editorconfig code guide updates
2013-04-23 17:34:27 +10:00
Mark Otto
23d7215dbe
Modify scrollspy to add .active to all parent li items /cc @fat
2013-03-29 23:32:47 -07:00
Ivan Khalopik
41c7825677
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class on accordion heading links
2013-03-29 19:17:03 +03:00
Mark Otto
a70c50d1f7
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/index.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
package.json
2013-03-01 12:37:21 -08:00
fat
839b0c893f
shiiiit
2013-02-28 21:15:33 -08:00
fat
3469339068
2.3.1
2013-02-28 20:55:14 -08:00
fat
01e0f8c653
only pass unique options through to child nodes in tooltips
2013-02-28 20:39:07 -08:00
fat
ef80765726
pass true to cycle
2013-02-28 19:47:01 -08:00
fat
40b7a909a6
le sigh
2013-02-28 19:37:30 -08:00
Mark Otto
2aa1a4dc70
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-07 22:18:53 -08:00
fat
501aabf572
remove prevent default on focus
2013-02-07 21:42:34 -08:00
fat
366e1e0a6d
only fire hidden once backdrop has been removed
2013-02-07 20:13:40 -08:00
fat
1bf070b4ce
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -08:00
fat
d8a7a380bc
if no callback, don't try to call callback ya goof
2013-02-07 19:45:42 -08:00
Mark Otto
a9729c5fd0
fix js from @fat feedback for modal
2013-02-07 19:38:46 -08:00
Yohn
60c9ff4364
unit tests
2013-02-06 06:20:05 -05:00
Yohn
beb60309d1
dont remove title attribute part 2
2013-02-06 06:17:48 -05:00
Mark Otto
8ca70bd83a
Overhaul modal to make it responsive and not super lame
2013-02-06 02:07:40 -08:00
Mark Otto
421f9f67c4
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
2013-02-05 22:42:54 -08:00
fat
3b56227553
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat
4814281540
clean up styles
2013-02-05 22:29:59 -08:00
fat
5e4db94c24
Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip
2013-02-05 22:10:41 -08:00
fat-kun
6a9cd513c0
Merge pull request #6783 from joprice/popoverOptionsOverride
...
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
Mark Otto
1629df8008
screwed up a merge and an old version number crept in
2013-02-05 21:20:29 -08:00
fat
a4b31d39a2
don't hide if already hidden ya n00b
2013-02-05 21:08:56 -08:00
fat
a866a51a2e
clear interval in cycle + rebuild
2013-02-05 20:34:39 -08:00
fat-kun
566380b257
Merge pull request #6488 from nanek/dropdowns-remove-touchstart
...
Remove touchstart from bootstrap-dropdown.js.
2013-02-05 20:08:42 -08:00
fat
c25e8182ba
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-02-05 20:01:25 -08:00
fat
45656fc7fc
update jquery to 1.9
2013-02-05 20:00:50 -08:00
Joseph Price
4b86a91e53
fix typo
2013-02-04 09:10:48 -05:00
Joseph Price
1fe4ed8823
reordered access of options in tooltip and popover to allow overriding data attrs from js
2013-02-02 18:58:56 -05:00
Guillaume Smet
b7764d8a33
Fix tooltip positioning for IE8
...
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
2013-01-29 19:50:13 +01:00
Guillaume Gautreau
ee71fb492f
No semicolumns
2013-01-27 10:56:01 +01:00
Guillaume Gautreau
5b0f956a60
Arrow replacement
2013-01-26 21:45:21 +01:00
Guillaume Gautreau
d9a0abaa06
works with fixed test
2013-01-26 21:39:49 +01:00
Guillaume Gautreau
db9ec13ce4
Test for replacing tooltip when resized
2013-01-26 21:39:05 +01:00
Guillaume Gautreau
e5be883bb9
lint + wrong comparison
2013-01-26 14:31:33 +01:00
Guillaume Gautreau
929598784f
Unit test for replacing tooltip inside window
2013-01-26 14:06:58 +01:00
Guillaume Gautreau
6803ff70f9
Tooltip positionning on special cases
2013-01-26 13:50:26 +01:00
Mark Otto
7d8d5c7838
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
Mark Otto
6e5a2fedaa
Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago
2013-01-10 18:51:04 -08:00
Kenan Shifflett
b5ad50686c
Removed touchstart from bootstrap-dropdown.js.
2013-01-07 20:13:28 -05:00
