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
Mark Otto
9749d6afc2
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2012-12-26 09:21:34 -06:00
fat-kun
b9c7f29134
Merge pull request #6378 from Yohn/patch-7
...
fixes tooltip insert problems
2012-12-24 16:17:25 -08:00
Yohn
9835549faf
made container option be false
2012-12-24 18:59:37 -05:00
Yohn
e867ae7b60
removed the length check
...
updated it to @fat's suggestion
2012-12-24 18:07:41 -05:00
Yohn
b6960d8cf9
Update js/tests/unit/bootstrap-tooltip.js
2012-12-23 04:21:02 -05:00
Yohn
d594d6377a
adding container option to tooltips
2012-12-23 04:18:16 -05:00
KAWACHI Takashi
defe85bb51
Assign event variables at declarations
2012-12-23 15:17:41 +09:00
KAWACHI Takashi
7a3a88acc6
Tooltips fires show, shown, hide, hidden events
...
It is re-worked from #3691 .
2012-12-23 14:42:13 +09:00
Mark Otto
f74990d898
Version bump
2012-12-22 16:10:06 -08:00
fat-kun
d09b46fe37
Merge pull request #6349 from Yohn/patch-6
...
Fixes #5753 with tooltip('toogle')
2012-12-22 14:53:24 -08:00
fat
effba9e55c
add data-api namespace to dropdown
2012-12-22 14:22:45 -08:00
fat
2c0ed072b0
shifting focus to parent and adding aria menuitem for dropdown
2012-12-22 13:57:57 -08:00
fat
a9e661a2b5
read data options in constructor for collapse
2012-12-22 13:48:16 -08:00
fat
fad0fb683b
allow multiple trigger types in tooltip and popover + default tooltip to hover & focus
2012-12-22 13:24:37 -08:00
fat
e2434fefbd
chnage for #6248
2012-12-21 20:27:53 -08:00
fat
24a36df9f6
add support for [data-slide-to] attr on carousel
2012-12-21 19:45:19 -08:00
fat
82a758344d
add direction prop to carousel slide event
2012-12-21 17:31:54 -08:00
fat
5da30ee5fb
Merge branch 'marcelkorpel-master' into 2.3.0-wip
2012-12-21 17:24:45 -08:00
fat
d5345f806c
Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master
2012-12-21 17:19:36 -08:00
Mark Otto
a5e04c0799
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
2012-12-20 13:47:36 -08:00
Yohn
a6705246d0
Update js/tests/unit/bootstrap-tooltip.js
2012-12-20 04:36:57 -05:00
Yohn
e21b6459ad
fixes tooltip('toggle')
2012-12-20 04:34:28 -05:00
fat
5abe33f5d8
reset carousel in the case that it is reinstantiated twice
2012-12-20 01:13:03 -08:00
fat
2c9f43f685
if carousel element already open, don't reopen it duh bruh bruh
2012-12-20 01:05:07 -08:00
Mark Otto
72f13e2870
Merge branch '2.2.3' 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/base-css.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/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
fat
7f9ff0ba5b
add js support for carousel indicators
2012-12-19 23:25:25 -08:00
fat
96e5fa6143
whitespace in tooltip + don't pass empty selector to $() in dropdown.js
2012-12-19 22:26:36 -08:00
fat
219d275ae6
can't extend bounding box thingy
2012-12-19 22:03:57 -08:00
fat
dc4e80a655
fix ghetto ass timeout shit
2012-12-19 21:55:23 -08:00
fat
5bd8cdca91
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
2012-12-19 21:36:50 -08:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Mark Otto
bc0b94a3fd
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
fat
820a3b27b6
get tests passing for typeahead :P
2012-12-07 19:16:48 -05:00
fat
1747caf19d
insert menu of typeahead after input which it suggests on #3529
...
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00
fat
437654030a
focus on escape in typeahead
2012-12-07 18:37:32 -05:00
fat
10e72e158d
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 17:50:34 -05:00
fat
91fbadad5b
remove slide from carousel constructor #5579
2012-12-07 17:49:05 -05:00
billy gates
c362e72660
Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav
...
Fix issue with double move event firing in typeahead.
2012-12-07 14:16:51 -08:00
fat
66b70016d0
rebuild and only select visible dropdown items
2012-12-07 17:14:49 -05:00
billy gates
2526c3fdbe
Merge pull request #6118 from godric7/master
...
scrollSpy - add parent scrollTop to offset calculation
2012-12-07 14:11:18 -08:00
fat
a7eb9c294a
add noConflict functionality to all bootstrap plugins
2012-12-07 17:06:01 -05:00
Mark Otto
33e14fe5bf
Merge branch '2.2.2-wip' into 3.0.0-wip
...
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
ed74992853
Fixes #4550 : Temporary fix for dropdown taps on mobile
...
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
2012-12-04 18:36:18 -08:00
Godric
8b959cacbc
Update js/bootstrap-scrollspy.js
...
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
2012-12-04 01:21:07 +01:00
Marcel Korpel
0dece7a71f
Set focus back to input field after clicking an item
...
Test 'focus is still set' added
Fixes issue #5933
2012-12-02 12:35:33 +01:00
Mark Otto
85c57c6ba8
Merge branch 'Moveo-master' into 2.2.2-wip
2012-12-02 01:32:13 -08:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Swaagie
e6e4d93d5e
leave it to the developer to decide how to use the content of the popover
2012-11-27 15:07:31 +01:00
Paul McLanahan
6ec7c72e5b
Fix issue with double move event firing in typeahead.
...
Fix test to catch issue.
Fix #5806 .
2012-11-13 11:00:34 -05:00
Mark Otto
79b7017227
version bump
2012-11-05 09:32:48 -08:00
fat
3b3dd3ac3c
2.2.1 - hotfix for carousel
2012-10-30 21:59:56 -07:00
fat
404e4d9e9a
fix carousel and rebuild js
2012-10-30 21:32:15 -07:00
Mark Otto
b5af762ef5
Merge branch '2.1.2-wip'
...
Conflicts:
js/bootstrap-dropdown.js
2012-10-29 22:01:58 -07:00
Mark Otto
41ad16fe40
v2.2.0 instead of v2.1.2
2012-10-29 21:00:53 -07:00
Jacob Thornton
ba2a99e7c4
don't lookup typeahead when shift alt or ctrl are pushed
2012-10-17 23:39:41 -07:00
Jacob Thornton
45046544a6
when static, refocus on click
2012-10-17 23:36:22 -07:00
Jacob Thornton
0b9d4e78ad
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-17 23:06:58 -07:00
Jacob Thornton
7f3b94c453
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
...
Conflicts:
js/bootstrap-carousel.js
2012-10-17 23:05:16 -07:00
billy gates
d6ac499ca8
Merge pull request #5309 from erlendfh/dropdown-bugfix
...
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17 23:00:41 -07:00
billy gates
24b5e6cb14
Merge pull request #5366 from Sinetheta/2.1.2-wip
...
Fix for #5362
2012-10-17 22:30:40 -07:00
Jacob Thornton
a2fc01444e
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-17 22:27:00 -07:00
Jacob Thornton
edc3eee5ea
fix carousel event
2012-10-17 22:26:44 -07:00
billy gates
21f29a7682
Merge pull request #5389 from frntz/2.1.2-wip
...
Update js/bootstrap-tooltip.js
2012-10-17 22:15:48 -07:00
billy gates
0a3e034891
Merge pull request #5524 from martinstein/fix-tooltip-delegate-click
...
Fix tooltip not working in delegate events on click-trigger
2012-10-17 21:34:01 -07:00
billy gates
97bf02d787
Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix
...
Fixed copy/paste caused typo
2012-10-17 21:25:21 -07:00
mfansler
e24b46b7f3
fixes #5336 : reorder focus() call to avoid scrolling
2012-10-16 12:27:43 -04:00
Dmitriy Budnik
ae0ba0686e
set spesific assertions count for test
2012-10-16 11:16:38 +03:00
Dmitriy Budnik
cd55963930
fixed test
2012-10-16 09:49:26 +03:00
dmitriybudnik
432eaff29c
Fixed copy/paste caused typo
2012-10-15 22:35:32 +03:00
Martin Stein
6b017b9bea
fixed reference to this.tip() so it works in delegate events
2012-10-15 15:17:59 +02:00
Kevin Attfield
48a8dd2a23
Added test to fix for #5362
2012-10-08 22:29:44 -07:00
frntz
b892a37320
Update js/bootstrap-tooltip.js
...
Avoid loosing events attached on Jquery object if added via function in popover content
2012-10-02 18:26:55 +03:00
Kevin Attfield
82715ae96d
Fix for #5362
...
Fix for issue [5362](https://github.com/twitter/bootstrap/issues/5362 ):
tab events fired on wrong dropdown anchor.
2012-09-30 21:41:37 -07:00
Carl Porth
e1f6458e36
don't wait for ready when binding events to document
2012-09-27 15:00:02 -07:00
Artem Kustikov
0944e036ae
Fix for #4550
...
Also fixes dropdowns hiding behavior for case when two or more dropdowns
with [data-toggle=dropdown] exist on the page
2012-09-27 21:45:37 +03:00
Erlend Halvorsen
e9a648cd39
Fixed bug in dropdown toggle where menu would only clear on the first drop down
2012-09-27 10:31:40 +02:00
Carl Porth
474471b831
bind data-api events to document instead of body to allow body replacement
2012-09-26 23:11:03 -07:00
Jacob Thornton
0540b63ab0
check affix pos on clicks - use timeout for clicks which scroll
2012-09-24 23:59:02 -07:00
Jacob Thornton
88b1e44dd6
change tooltip/popover insert strategy
...
remove modal-open class
hopefully resolve z-index headaches
2012-09-24 23:28:38 -07:00
Jacob Thornton
003fcccceb
change tooltip/popover html default to false for xss safety net
2012-09-24 23:15:36 -07:00
Jacob Thornton
ebf94c53a5
change transition.js, rebuild… travis maybe will be happy?
2012-09-20 16:50:36 -07:00
Jacob Thornton
1716b0fdb5
remove src's
2012-09-20 16:31:10 -07:00
Jacob Thornton
fe38d12f12
rebuild - fix missing (
2012-09-20 16:26:00 -07:00
Jacob Thornton
667179f406
added support for jquery 1.8.*
2012-09-20 16:23:54 -07:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
Ross Johnson
b5373d8561
Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip
2012-08-28 11:14:34 -05:00
Ross Johnson
66ad3d62c6
Fix key events with Chrome + jQuery 1.8.0
2012-08-28 00:55:56 -05:00
Jacob Thornton
3568146b28
only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements
2012-08-27 21:44:09 -07:00
Jacob Thornton
4751a0a274
crude check to make sure element has a # for an id
2012-08-27 21:27:01 -07:00
Jacob Thornton
601e252074
fix for #4761
2012-08-27 20:58:51 -07:00
Ryan Pavlik
019d9bf0f3
Fix typo found with codespell.
2012-08-23 11:41:55 -05:00
Mark Otto
1c134d9a7f
update version numbers to 2.1.1
2012-08-21 13:11:25 -07:00
Mark Otto
e510306196
bump versions to 2.1.0
2012-08-19 23:07:18 -07:00
Jacob Thornton
c9cef741f6
listen to touchstart for dropdowns on mobile
2012-08-18 20:18:15 -07:00
Jacob Thornton
45dddc59a1
add click option for tooltip, popover - make click default for popover
2012-08-18 19:54:30 -07:00
Jacob Thornton
ff38c14948
stray ;
2012-08-14 21:23:29 -07:00
Jacob Thornton
dee57462e2
get affix actually working and update docs
2012-08-14 21:06:08 -07:00
Jacob Thornton
2b2b3303e1
fix indexof on array for ie8
2012-08-02 16:58:25 -07:00
Dirk Ginader
6977d35eed
close #3531 added focus handling and removed the badly announced "times" close button from screenreaders
2012-08-01 20:11:16 -07:00
Jonathan Sampson
2a0cf0f131
IE10 uses 'transition' and 'transitionend'
...
msTransition, while supported in IE, should be ignored in favor of the
unprefixed property. Additionally, MSTransitionEnd should also be
ignored in favor of the unprefixed event transitionend.
Current unit test requires no attention in light of this change.
MSDN:
http://msdn.microsoft.com/en-us/library/ie/hh673535(v=vs.85).aspx#transitions_dom_events
2012-07-24 01:50:38 -04:00
Jacob Thornton
614d52bd7f
delete this test for now - as affix is still heavily underdevelopment
2012-07-23 18:17:43 -07:00
Aleksey V Zapparov
76cfe17002
Fix transition end name for opera 11+12
...
Fix transition end name for Opera 11 and Opera 12.
Should fix issues: #3896 , #3897 , #4157 , #4158
2012-07-23 20:56:18 +02:00
Jacob Thornton
dcf75697ec
some progress on affix plugin
2012-07-22 18:28:39 -07:00
Jacob Thornton
fa1e1e34df
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
2012-07-22 14:52:13 -07:00
Jacob Thornton
fae6c36874
adds minLength #3960
2012-07-22 14:50:52 -07:00
Jon Stevens
d76c899142
remove the ns option
2012-07-22 14:36:23 -07:00
Jon Stevens
393f4a7b42
simplify things to one line. pull #4104
2012-07-22 14:19:11 -07:00
Jon Stevens
117f65d431
on destroy, also hide. issue #3880 , pull #4104
2012-07-20 09:47:12 -07:00
Jon Stevens
2ee9b2717b
namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880
2012-07-16 16:01:11 -07:00
Jacob Thornton
1e717991e8
Merge pull request #3880 from lookfirst/popover-destroy
...
Add popover / tooltip destroy method
2012-06-20 12:02:05 -07:00
Jacob Thornton
eb62c977cd
Merge pull request #3770 from Barryvdh/2.1.0-wip
...
Scope carousel .active to .item
2012-06-20 10:58:20 -07:00
Jon Stevens
3a5b4cc7df
simplify code into a single line
2012-06-20 10:42:25 -07:00
Jacob Thornton
b2b000b750
change transition end name for opera
2012-06-20 10:40:56 -07:00
Jon Stevens
47e0647086
add unit tests for destroy behavior of popover and tooltip
2012-06-18 19:51:49 -07:00
Jon Stevens
6a974f9ff7
enable the ability to destroy tooltips and popovers from elements. related to issue #3453
2012-06-18 19:25:54 -07:00
Barryvdh
c028e33358
Scope finding the .active to .item
2012-06-08 16:19:08 +03:00
Jacob Thornton
82ea5847a7
adds remote source to modal. Remote source can be specified in href or by providing a remote option #936
2012-06-03 21:26:54 -07:00
Jacob Thornton
31e8a358c3
check length so that pause, actually pauses
2012-06-03 11:24:19 -07:00
Jacob Thornton
2d3a0babd2
make active selector more specific #2043 and rebuild
2012-06-02 22:10:35 -07:00
Matt Morgan
af14f6db5d
Merge branch 'async' into 2.1.0-wip
2012-06-03 00:33:06 -04:00
Jacob Thornton
91a7274a43
only set height explicitly for collapse when animation is supported #2131
2012-06-02 21:26:34 -07:00
Jacob Thornton
ebc1fe907d
only trigger $.support.transition.end when it exists
2012-06-02 21:09:13 -07:00
Jacob Thornton
3a751a63d4
fix multi carousel bug #3194
2012-06-02 21:01:45 -07:00
Jacob Thornton
555a3b0478
fix carousel when hiding a reshowing - make sure it always triggers transition end #3248
2012-06-02 20:28:08 -07:00
Jacob Thornton
0b827965d3
fix regression in typeahead #3313
2012-06-02 19:31:30 -07:00
Jacob Thornton
354f99f0bd
add length to parent dropdown check #3316
2012-06-02 19:02:30 -07:00
Jacob Thornton
4ca1cba3f8
upgrade jquery to 1.7.2 #3379
2012-06-02 18:25:07 -07:00
Jacob Thornton
b07b869b26
rebuild assets
2012-06-02 18:15:23 -07:00
Jacob Thornton
806a82ef83
add relatedTarget to carousel slide event
2012-06-02 18:06:00 -07:00
Jacob Thornton
037107480d
remove isHTML support
2012-06-02 17:57:36 -07:00
Jacob Thornton
f836473129
add html option back to tooltip and popover to explicitly prevent XSS #3421
2012-06-02 17:55:10 -07:00
Jacob Thornton
5b401a8c16
add collapsed class to collapse invoker when it's target is collapsed #3525
2012-06-02 17:28:38 -07:00
Jacob Thornton
5e5965ca6f
Merge branch 'accessibility' into 2.1.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Jacob Thornton
ebc6935663
2.0.3 -> 2.0.4
2012-06-01 11:04:27 -07:00
Jacob Thornton
4eaeea81fd
rebuild and fix test
2012-05-31 10:24:23 -07:00
Jacob Thornton
bcd5097c02
Merge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30
...
Updated unit test for tooltips. Now using is() instead of hasClass()
2012-05-31 09:03:53 -07:00
Jørgen Borgesen
8dda83906d
Swapped out .hasClass() with .is() when checking for multiple classes
2012-05-20 20:10:21 +02:00
Jørgen Borgesen
e388a5e475
Added unit test to check that tooltips is not showed when leave event is triggered before show delay has expired AND the hide delay is set to 0
2012-05-20 19:59:53 +02:00
Jacob Thornton
b1d7c34086
remove log
2012-05-17 00:45:28 -07:00
Jacob Thornton
9889948f58
abandon activedescendant because it was awful
2012-05-17 00:39:14 -07:00
Jacob Thornton
a7b49a7d92
nearly everything working with activedescendant... then decide it's wrong.
2012-05-17 00:23:11 -07:00
Jacob Thornton
10c6db4b14
add proper role to dialog markup and cleanup modal logging
2012-05-16 19:43:22 -07:00
Jacob Thornton
4b53778150
Merge branch 'master' into 2.0.4-wip
2012-05-16 19:10:49 -07:00
Jacob Thornton
a404ac33bb
modal accessibility tab control
2012-05-16 19:09:57 -07:00
Jørgen Borgesen
e9a7d26d06
Cancel running timer for tooltips with delayed show, but instant hide. This prevents delayed tooltips from appearing if the mouse leaves the elements before tooltip is showed and the hiding delay is 0.
2012-05-14 14:03:36 +02:00
Anirvan Chatterjee
ec56940c51
several spelling corrections
2012-04-27 10:48:59 -07:00
Matt Morgan
bf9d8fcc07
Alter typeahead to accept synchronous/asynchronous data source via function/callback
2012-04-26 14:09:20 -04:00
Jacob Thornton
fc509e14b2
revert position -> offset for typeahead position
2012-04-25 22:14:39 -07:00
Jacob Thornton
a29e5a9dd6
fix #3234
2012-04-25 21:52:05 -07:00
Jacob Thornton
aaabe2a46c
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)
2012-04-24 18:06:41 -07:00
Jacob Thornton
839ef3a030
2.0.2 -> 2.0.3
2012-04-24 02:19:02 -07:00
Jacob Thornton
c408d8961b
rewrite server.js, fix travis
2012-04-23 03:44:32 -07:00
Jacob Thornton
c896a182e1
increase length of waitfor timeout for phantom
2012-04-23 03:18:13 -07:00
Jacob Thornton
f84882122e
style changes to phantom integration
2012-04-19 17:40:58 -07:00
Jacob Thornton
03f78f7a60
run qunit tests in phantomjs for travis-ci
2012-04-19 17:34:07 -07:00
Jacob Thornton
bc07e2adae
allow for pushstate in scrollspy
2012-04-18 13:35:14 -07:00
Jacob Thornton
8f98c4fbf6
offset -> position #3088
2012-04-18 13:15:13 -07:00
Nirav Sanghani
8e8b1ad03d
Allow updater function (updates the value of the input field) to be overridden.
2012-04-16 17:05:35 -07:00
Jacob Thornton
0b8042656f
fixes #2941 + whitespace in collapse
2012-04-15 16:15:32 -07:00
Jacob Thornton
be0efcfcfc
whitespace
2012-04-14 23:38:11 -07:00
Jacob Thornton
1ca1ef94ee
fix opera bug \o/ !!!! #1776
2012-04-14 23:24:19 -07:00
Jacob Thornton
b14455b03a
add tests for mouseout delay in tooltip
2012-04-14 23:10:03 -07:00
Jacob Thornton
c7dc4cc573
change position of var in dropdown + cleanup makefile vars
2012-04-14 22:43:36 -07:00
Jacob Thornton
d65f7f204a
don't open dropdown if target is disabled
2012-04-14 21:44:57 -07:00
Jacob Thornton
82267d48ff
calling pause on a slide should actually pause it - even when hovering
2012-04-14 17:49:51 -07:00
Jacob Thornton
81a296d06a
whitespace
2012-04-14 16:38:44 -07:00
Jacob Thornton
c291e4d786
fix typeahead test
2012-04-14 16:32:20 -07:00
Jacob Thornton
575f18aaf4
add jshint support + a few minor stylistic changes
2012-04-14 16:29:53 -07:00
Jacob Thornton
08fee005a8
https://github.com/twitter/bootstrap/issues/2954
2012-04-07 21:26:46 -07:00
Jacob Thornton
83febb3452
remake and add isHTML check to popover as well
2012-04-04 15:02:30 -07:00
Jacob Thornton
4bd611884a
detect if title in tooltip is text or html. if text - use text
method to prevent xss.
...
all add a few notes to js readme about updated event
2012-04-04 14:58:04 -07:00
Jacob Thornton
2dc979a202
MSTransitionEnd + move paren (thanks rick waldron)
2012-03-29 14:14:17 -07:00
Jacob Thornton
0665c3ebf7
move over paren just because.
2012-03-29 13:55:56 -07:00
Jacob Thornton
422d04cb2b
simplify transition plugin a little
2012-03-29 13:51:23 -07:00
Jacob Thornton
30b3f47e31
remove "technique"
2012-03-29 12:48:37 -07:00
Jacob Thornton
8ea8c312ea
replace UA sniffing
2012-03-29 12:35:06 -07:00
Jacob Thornton
3e7920820a
add missing closing brace
2012-03-24 20:01:51 -07:00
Jacob Thornton
0dfff052cb
add MSTransitionEnd event to js plugin
2012-03-24 19:02:55 -07:00
Jacob Thornton
f02d017ffa
return matcher value directly + cleanup first lines of files
2012-03-24 18:59:04 -07:00
Jacob Thornton
bccc2cb719
add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last
2012-03-24 18:20:09 -07:00
Jacob Thornton
ef5ac02b69
allow prevent default for show and hide event in modal
2012-03-24 17:50:21 -07:00
Jacob Thornton
b3bf223617
filter out non matches in map
2012-03-21 23:59:27 -07:00
Jacob Thornton
20e085723b
cache $(href) lookup
2012-03-21 23:51:32 -07:00
Jacob Thornton
706ee46b73
sort scrollspy to prevent flicker for unordered nav
2012-03-21 23:45:58 -07:00
Jacob Thornton
94b24aaa47
clear timeout to reset delays for tooltip/popover
2012-03-21 21:57:06 -07:00
Jacob Thornton
22963d7346
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-21 21:37:17 -07:00
Jacob Thornton
d5fb653914
top stripping leading and trailing whitespace + always use .html method
2012-03-21 21:35:02 -07:00
Jacob Thornton
cb8dcfcebf
if transitioning collapse, don't start new transition
2012-03-20 22:43:27 -07:00
Jacob Thornton
663e41d74f
prevent dropdowns from closing when clicking inside form element inside dropdown
2012-03-19 23:13:55 -07:00
Jacob Thornton
63bd7cb478
fix slide logic for ie+ in carousel
2012-03-19 21:39:39 -07:00
Jacob Thornton
bce33bbb09
if parent in collapse, only grab children
2012-03-19 21:10:55 -07:00
Jacob Thornton
630ff4ff7d
fix collapse bug in ie7+ for initial collapse in
2012-03-19 20:51:20 -07:00
Jacob Thornton
384a082e8d
active - onActivate
2012-03-19 20:24:46 -07:00
Jacob Thornton
05e0d5f3d9
fire active event on active
2012-03-19 16:09:08 -07:00
Jacob Thornton
67f199678c
if interval is false, do not autocycle the carousel
2012-03-19 15:48:57 -07:00
Jacob Thornton
83a7a69893
typeahead should escape regexp special chars
2012-03-19 15:33:28 -07:00
Jacob Thornton
bf59220b87
;)
2012-03-19 15:19:01 -07:00
Jacob Thornton
5a2c7eb50a
select last item in scrollspy if you've reached the bottom of the document or element
2012-03-19 15:18:00 -07:00
Jacob Thornton
527fb87dad
add /head
2012-03-17 21:29:56 -07:00
Jacob Thornton
59503e71ff
2.0.2 derp
2012-03-12 14:09:38 -07:00
Jacob Thornton
56fe54df43
remove collapse class on open so that dropdowns are viewable
2012-03-12 13:37:44 -07:00
Mark Otto
95cb6f07a8
Merge branch 'zerkms-master' into 2.0.2-wip
...
Conflicts:
Makefile
2012-03-11 17:38:23 -07:00
Ivan Kurnosov
354252b4b5
Grammar fix in js/README.md
2012-03-12 10:24:18 +13:00
Jacob Thornton
26e683f1d0
Merge pull request #2177 from phopkins/typeahead_friendly
...
[2.0.2-wip] Typeahead friendly
2012-03-08 11:14:56 -08:00
Jacob Thornton
43760eb202
fix for @pamelafox and #1861
2012-02-24 22:17:36 -08:00
Jacob Thornton
fb74018ae2
and pause on hover option to carousel
2012-02-24 21:51:39 -08:00
Pete Hopkins
3a6f58598c
Allows escape to bubble when menu isn't shown
2012-02-22 14:19:55 -05:00
Pete Hopkins
70fecd1115
Fires change event when element is selected from menu
2012-02-22 14:19:55 -05:00
Pete Hopkins
80d03e143c
Allow events to propagate / default if not used.
...
- All key events when the menu is not shown now propagate.
- Blur is also allowed to propagate.
2012-02-22 14:19:55 -05:00
Jacob Thornton
f046c12bd2
fix cycling in carousel
2012-02-20 22:01:38 -08:00
Jacob Thornton
3d58b46226
fix bootstrap-button toggle regression + tests
2012-02-18 23:29:58 -08:00
Jacob Thornton
7ec09d0db9
2.0.1
2012-02-16 22:42:38 -08:00
Jacob Thornton
9d12b2d601
don't try next if not next
2012-02-16 20:43:57 -08:00
Jacob Thornton
e730f8adb5
null out interval so that pause doesn't resume on next or prev
2012-02-16 20:22:01 -08:00
Jacob Thornton
792059b7ad
fix alerts
2012-02-16 20:04:26 -08:00
Jacob Thornton
6e77c9d123
add semicolons to the end of js files
2012-02-13 18:41:02 -08:00
Jacob Thornton
5b4a29d84e
honor data attributes set on modal as well
2012-02-12 11:15:12 -08:00
Jacob Thornton
139a077543
don't use e.target incase button has icon or other content inside it
2012-02-07 21:55:27 -08:00
Mark Otto
a10c23f1aa
Merge branch 'CaryLandholt-master' into 2.0.1-wip
2012-02-06 23:42:02 -08:00
Mark Otto
6325402372
Merge branch 'master' of https://github.com/CaryLandholt/bootstrap into CaryLandholt-master
2012-02-06 23:41:53 -08:00
raphaelz
3722bb9a88
Grammatical changes have been made as suggested by @cvrebert for issue #1787 .
2012-02-07 02:11:25 -05:00
Jacob Thornton
c8c4d5b392
fix alert tests + add show option back to modals
2012-02-06 00:17:31 -08:00
Cary Landholt
c3c13a2474
Fixed typo "tabs" ==> "button"
2012-02-01 22:20:24 -06:00
Mark Otto
f34ddb5c3f
nuke all curly ticks
2012-02-01 18:27:38 -08:00
Mark Otto
160a0bf560
update tests for popover to use proper classes
2012-01-30 01:30:18 -08:00
Mark Otto
f4e5bc1c53
namespace popover values
2012-01-30 01:20:51 -08:00
Mark Reeder
f9b53d424e
Fixes issue with Opera flickering on the collapse plugin when reset is called without specifying the size
...
https://github.com/twitter/bootstrap/issues/1208
2012-01-29 21:14:07 -08:00
Mark Otto
0952f3796e
fix js readme api capitalization
2012-01-29 13:07:31 -08:00
Jacob Thornton
6935f693b3
typahead does case insensitive matching with simple sorter + accepts highlighter option
2012-01-28 13:16:05 -08:00
Jacob Thornton
12d3c2fe74
fix z-index issue with modals for popovers,tooltips,and dropdowns
2012-01-28 12:08:41 -08:00
Jacob Thornton
c2c02d104c
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 11:04:05 -08:00
Jacob Thornton
d465952138
clean up js api for dropdowns
2012-01-28 11:03:39 -08:00
Jon Stevens
8ade6989c3
no debugger
2012-01-28 02:25:13 -08:00
Jacob Thornton
e61164e67a
all unit tests passing in ie7
2012-01-28 01:35:13 -08:00
Jacob Thornton
3451dcbc28
fix failing typeahead tests
2012-01-28 00:03:26 -08:00
Jacob Thornton
7cbb586825
move the matcher and sorter into the options - encourage people to override them...
2012-01-27 22:27:06 -08:00
Jacob Thornton
0255f47eb3
add zindex option for tooltips/popovers and fix modal zindex doc example
2012-01-27 21:36:58 -08:00
Jacob Thornton
3b3dbd7229
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 11:07:17 -08:00
Jacob Thornton
aa594501bd
change typeahead to data-source instead of data-data and add to docs
2012-01-26 23:16:02 -08:00
Jacob Thornton
11d7ef1515
Merge pull request #1272 from napoleond/2.0-wip
...
Support tab and enter in typeahead
2012-01-26 23:04:42 -08:00
Mark Otto
5a48b22b83
Merge pull request #1269 from phopkins/ie_typeahead
...
[2.0-wip] Fix typehead plugin for IE7/8
2012-01-26 17:04:35 -08:00
David N
b9589fcb80
Enable default browser key behaviour when typeahead isn't showing.
2012-01-26 17:23:09 -06:00
Mark Otto
5844aa550d
consistent new lines at ends of files
2012-01-26 15:00:59 -08:00
Pete Hopkins
1f04481092
Switches from Array#filter to jQuery.grep for IE<=8 support
2012-01-26 17:07:06 -05:00
Jacob Thornton
319b65e64b
prevent default
2012-01-25 11:49:00 -08:00
Jacob Thornton
5e5e87fbd0
scrollspy working for sub navs
2012-01-24 22:33:33 -08:00
Jon Stevens
84a8aa1bea
2.0-wip: fix js heads
2012-01-24 11:08:03 -08:00
Eden
ec68b84123
i don't think the batch s/2011/2012/ was supposed to hit this. :)
2012-01-24 08:27:19 -08:00
Nicklas Ansman Giertz
4882e6da2f
Rename the tooltip test file
...
It had not been renamed when twipsys became tooltips.
2012-01-22 12:33:30 +01:00
Nicklas Ansman Giertz
05fdd43e41
Add testcase to popover
...
This test case verifies that custom classes are respected.
2012-01-22 12:32:37 +01:00
Nicklas Ansman Giertz
6a9f169fd6
Make the popove respect custom classes
2012-01-22 12:06:59 +01:00
Jacob Thornton
373a54187e
add ability to cycle carousel to a particular frame
2012-01-21 23:02:29 -08:00
Jacob Thornton
6e490628d1
more efficient matcher + bold matched query in item
2012-01-21 22:06:36 -08:00
Jacob Thornton
4fe11342d0
make case lookahead case insensitive
2012-01-21 21:46:47 -08:00
Jacob Thornton
2187e0838f
change scrollspy offset to be option + fix typo in scrollspy
2012-01-21 21:35:20 -08:00
Jacob Thornton
3ed836b198
should check for alert class not alertmessage
2012-01-20 13:50:36 -08:00
Jacob Thornton
93c8152216
only prevent default if getting data-href
2012-01-20 13:42:10 -08:00
Jacob Thornton
593b062c7a
wrap transition
2012-01-17 10:32:25 -08:00
Mark Otto
16eccc43d9
dates updated to 2012
2012-01-14 23:28:48 -08:00
Renault John Lecoultre
2cea94e892
Fixed when placement is a function
2012-01-13 22:33:05 +01:00
Jacob Thornton
6f2f947a43
add build tool for js + rename twipsy to tooltip + lots of little doc cleanup
2012-01-11 21:42:55 -08:00
Jacob Thornton
7aca72322e
move hover state out of timeout duh
2012-01-08 15:12:34 -08:00
Jacob Thornton
91d393fd47
change prepend to append
2012-01-08 15:01:23 -08:00
Jacob Thornton
aa0c4acd80
fix modal insertion boolean
2012-01-08 14:38:21 -08:00
Jacob Thornton
76cadd1d2a
only append modal to dom if not already present
2012-01-08 14:36:41 -08:00
Jacob Thornton
5a33c1b96e
make dropdowns toggle when clicked (for mobile)
2012-01-08 14:19:53 -08:00
Jacob Thornton
f83240a8f9
add slide and slid events + disable sliding during slide
2012-01-08 13:39:27 -08:00
Jacob Thornton
fbd686ad65
get tabs working in ie9
2012-01-08 12:08:00 -08:00
Jacob Thornton
f1cbd22b99
fix buttons for firefox
2012-01-08 11:23:51 -08:00
Jacob Thornton
4478df7681
first pass at ultra basic autocomplete
2012-01-08 00:49:38 -08:00
Jacob Thornton
dd99e2d048
start of autocomplete plugin
2012-01-06 18:30:32 -08:00
Jacob Thornton
64c8623533
Merge pull request #907 from ansman/2.0-wip
...
Twipsy now respects custom classes
2012-01-06 11:07:59 -08:00
Nicklas Ansman Giertz
969fbe7150
Add a test case for issue #908 (twipsy doesn't respect custom classes)
...
The test case verifies that a custom class is respected.
2012-01-06 11:33:18 +01:00
Nicklas Ansman Giertz
f07bcafd39
Make twipsy respect custom classes when using a custom template
...
If you had a custom class to the root object twipsy would overwrite
that class ($tip[0].className = 'twipsy'), now this has been changed
so it removes only classes that twipsy adds.
2012-01-06 11:16:29 +01:00
Jacob Thornton
314feb702f
listen to window for dropdown clear
2012-01-05 18:32:08 -08:00
Jacob Thornton
5661855be3
actuall use interval option :P
2012-01-02 22:57:04 -08:00
Jacob Thornton
e89618a47f
clean up options implementation for carousel
2012-01-02 22:55:51 -08:00
Jacob Thornton
3fb6f6ee86
basic carousel implementation
2012-01-02 22:30:57 -08:00
Jacob Thornton
2d092dfeea
start playing with carousel stuff
2012-01-02 16:04:01 -08:00
Jacob Thornton
12868933b9
clean up dead elements in firefox (which is droping transitionEnd events :(
2011-12-24 23:06:16 -08:00
Jacob Thornton
4ef5a90445
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2011-12-24 22:56:40 -08:00
Jacob Thornton
823d89dbb2
move position of twipsy into getPosition so it can easily be extended for svg use
2011-12-24 22:56:01 -08:00
Jacob Thornton
a3822cfa84
Merge pull request #842 from jonathaningram/patch-2
...
Add close and closed hooks for alert
2011-12-24 22:16:48 -08:00
Jacob Thornton
ea23461970
fix unit test for twipsy
2011-12-22 19:28:58 -08:00
Jacob Thornton
87ac818253
change above below to top bottom and add "inside" placement option
2011-12-22 19:10:32 -08:00
Jonathan Ingram
5de1e39a8f
From #822
2011-12-22 16:41:26 +11:00
Jacob Thornton
6d5b506517
minor cleanups
2011-12-21 17:38:05 -08:00
Jacob Thornton
80cb760fac
animate -> animation
2011-12-21 13:29:12 -08:00
Jacob Thornton
f72a94ae28
update more readme changes - introduce target specificty convention to more plugins
2011-12-20 23:28:48 -08:00
Jacob Thornton
0980a33b47
update all to new on api + add animation support to tabs
2011-12-20 19:37:41 -08:00
Jacob Thornton
1ef5fa7d6b
giant refactor - all spec passing again...
2011-12-20 18:02:47 -08:00
Jacob Thornton
7df0d1c7d1
rename transitions to transition and fix scrollspy example
2011-12-14 18:45:33 -08:00
Mark Otto
aa69286c30
rename transitions js file, fix link in js docs
2011-12-13 10:05:19 -08:00
Jacob Thornton
cee2f61898
define constructor on prototypes
2011-11-30 22:42:22 -08:00
Jacob Thornton
b1cba98aab
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2011-11-30 22:05:49 -08:00
Jacob Thornton
dc628c9115
start of carousel
2011-11-30 22:05:09 -08:00
Silumesii Maboshe
1af3596a5e
Capitalising 'Bootstrap' and abbreviations. Fixing typos.
2011-11-28 08:13:54 +02:00
Jacob Thornton
7eb340ec58
add code to reset data for collapsed element so that item can be intitialized with correct options
2011-11-27 17:31:12 -08:00
Jacob Thornton
7522517b47
derp
2011-11-27 17:12:58 -08:00
Jacob Thornton
f77d0c21df
turn attribute rules to list
2011-11-27 17:12:17 -08:00
Jacob Thornton
76f95f4ea2
change even was removed, in favor of show shown
2011-11-27 17:11:31 -08:00
Jacob Thornton
7f74f11262
fix heading for js readme...
2011-11-27 17:09:31 -08:00
Jacob Thornton
46fe38386a
rename tabs to tab - clean up lots of api stuff make href acceptable target val
2011-11-27 17:04:55 -08:00
Jacob Thornton
3925ea9986
remove trailing semicolons - we'll be hosting minified files with semicolons - no reason to make the dev source ugly
2011-11-27 16:01:26 -08:00
Jacob Thornton
3157de8d1d
clean up comments for better built files
2011-11-25 21:34:55 -08:00
Jacob Thornton
bd8745a98b
allow scrollspy to target a specific nav
2011-11-25 17:30:52 -08:00
Jacob Thornton
98fddaa355
new plugin "collapse" for collapsible lists and "accordion" like support
2011-11-25 17:23:14 -08:00
Jacob Thornton
96adf8f918
fix copy paste bug
2011-11-24 20:27:55 -08:00
Jacob Thornton
53ff2682cd
clean up scrollspy a bit - add public api method
2011-11-24 20:27:18 -08:00
Jacob Thornton
b14f551c9c
fix some more modal things
2011-11-24 20:12:13 -08:00
Jacob Thornton
1fa02fbda2
refactor modal
2011-11-24 20:04:07 -08:00
Jacob Thornton
69372701cf
refactor dropdown in accordance with readme
2011-11-24 19:40:25 -08:00
Jacob Thornton
71654cbf69
refactor alerts + add new readme which idefientifies goals for 2.0 js
2011-11-24 18:55:44 -08:00
Jacob Thornton
b2650859d6
update buttons js for button groups
2011-11-24 14:43:26 -08:00
Jacob Thornton
36a7eb3851
add build script for minified files and allow elements to be returned to getContent and title in popovers
2011-11-20 21:36:26 -08:00
Jacob Thornton
47c7f655ac
update comment numbers
2011-11-20 21:13:28 -08:00
Jacob Thornton
8a891f2a7b
act on all twipsy instances
2011-11-20 21:06:32 -08:00
Jacob Thornton
bc65b58551
merge in js from 1.4... start working through js docs
2011-11-20 20:58:04 -08:00
Jacob Thornton
0b1d5d9189
revert all js stuff back to 1.4 :/
2011-11-20 18:19:50 -08:00
Jacob Thornton
523e02f7df
fix scrollspy simplify stuff more - break everything.
2011-10-19 23:12:50 -07:00
Jacob Thornton
8545fe9787
greatly simply js plugins - remove js api where reasonable
2011-10-19 21:56:06 -07:00
Jacob Thornton
c9669be1ec
get modal working with new data-attrs
2011-10-05 00:14:55 -07:00
Jacob Thornton
a91a407bd6
start updating to data- driven js
2011-10-04 21:48:53 -07:00
Mark Otto
2d81d65533
initial idea for handling closing of modals from whatever element you want with .js-dismiss class
2011-09-28 20:21:09 -07:00
Mark Otto
ec8619a980
update docs to remove old stuff, update to all new classes; no more backwards compatibility
2011-09-17 17:21:43 -07:00
Jacob Thornton
f0d5caf054
check for jquery/ender on window
2011-09-16 11:09:26 -07:00
Jacob Thornton
d1b594db7a
$(document).ready instead of $(function() {}) for ender support
2011-09-15 23:16:06 -07:00
Jacob Thornton
ad87e11f03
add version number to js comments
2011-09-12 11:15:32 -07:00
Jacob Thornton
dcf9aabc44
get all spec passing again
2011-09-11 22:58:51 -07:00
Jacob Thornton
200f5817ba
method invocation jqueryui style
2011-09-11 21:03:17 -07:00
Jacob Thornton
173be3f1e8
change hella js... broke all the tests. i <3 wip
2011-09-11 20:08:43 -07:00
Jacob Thornton
709789d16d
clicking open dropdown shoud close it
2011-09-10 22:28:17 -07:00
Jacob Thornton
7e5b304dbf
add liscense to js files
2011-09-10 22:24:31 -07:00
Jacob Thornton
64176caa97
add bootstrap-scrollspy
2011-09-10 22:14:57 -07:00
Jacob Thornton
a71d5d8e99
add the dhg flavor back
2011-09-10 19:01:16 -07:00
Jacob Thornton
235246d6fc
not feeling the slide in
2011-09-10 18:26:37 -07:00
Jacob Thornton
9c76070cbd
rework the transitions for the modal a bit
2011-09-10 18:13:37 -07:00
Jacob Thornton
5f65df9e2d
add some more events to alerts and modal and update docs
2011-09-10 14:04:22 -07:00
Jacob Thornton
1041977d0a
finish up rounding out tests for all js plugins
2011-09-10 13:17:08 -07:00
Jacob Thornton
48aa209348
more tests, more js goodness
2011-09-10 12:49:21 -07:00
Jacob Thornton
5f4e30ed1d
move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like
2011-09-09 22:47:49 -07:00
Jacob Thornton
96c3e70996
cleanup old stuff
2011-05-03 18:12:43 -07:00
Mark Otto
677b5554f3
Remove the unnecessary global.js file, remove the old baseline grid image, add in hashgrid, update readme to remove finished todos;
2011-04-27 14:49:56 -07:00
Mark Otto
eb81782cdb
Porting over all Blueprint styles to new Baseline repo
2011-04-27 13:53:51 -07:00