root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,919 Commits 109 Branches 92 Tags 664 MiB
Commit Graph

377 Commits

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