root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity
2,867 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

252 Commits

Author SHA1 Message Date
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