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

696 Commits

Author SHA1 Message Date
Chris Rebert 0aaf2cdd3a quote attribute values in selectors in JS unit tests for consistency 2014-04-19 17:45:58 -07:00
fat f2af95353e fixes #13296 Dropdown disappears with right-click on Firefox 2014-04-15 21:52:34 -07:00
fat cd4696f723 fixes #11099 - $.collapse() overrides the original dimension of the coll... 2014-04-15 21:16:40 -07:00
Germán M. Bravo 82b066f0a9 Wait for the expected target during a collapse 
Actually wait for the collapsed item to complete. If complete is called
with other target, instead of simply returning and do nothing, wait again
until the proper target triggers the event (otherwise this leaves collapse
in a broken state).
 2014-04-12 14:44:35 -05:00
XhmikosR 45b476bdbf JS: remove unused variables. 2014-04-09 10:01:48 +03:00
Collin Donahue-Oponski d7a3771abd When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs.dropdown' 
Closes #11281 by merging it (after rebasing & resolving conflicts)
 2014-04-08 22:36:21 -07:00
Chris Rebert 5ef634dab9 replace $.bind() with $.on() in unit tests; per #13272 2014-04-03 18:13:16 -07:00
XhmikosR 2b30b48894 Fix the new JSHint warnings. 2014-04-03 10:53:13 +03:00
Chris Rebert 26f6807a3d Add comments in carousel.js to clarify that "slid" is not a typo 
Addresses #13248.
 2014-03-31 18:09:24 -07:00
Tyler Cipriani 0907244256 Modal body shift fix for IE10/11 
Closes #13103 by merging it.
 2014-03-28 23:45:22 -07:00
Ashley Dawson 138af82e29 Fixed nested tab elements li activation 
Added closest li instead of direct parent so that you can nest multiple elements within tabs, such as button groups
 2014-03-26 22:21:54 +00:00
Jacob b3421cf040 Merge pull request #13165 from stefanneculai/master 
Fix popover when using append
 2014-03-24 22:42:40 -04:00
Mark Otto 39fec66fc4 Merge branch 'master' into fat-9461 2014-03-24 19:30:17 -07:00
fat 4a2d337bf5 fixes #9461 - Make carousel ignore non-items in carousel-inner 2014-03-24 19:23:39 -07:00
Stefan Neculai 674b41dd63 Add test for popover. 2014-03-24 19:49:06 +02:00
Stefan Neculai 41628c90a2 Fix popover when using append. 2014-03-24 18:49:03 +02:00
XhmikosR d74aee4093 tests/index.html: re-indent. 2014-03-24 09:30:44 +02:00
XhmikosR cfb7093dc0 tests/index.html: add missing `meta charset`. 2014-03-24 09:28:57 +02:00
XhmikosR 58ea8a5601 Update QUnit to v1.14.0. 2014-03-24 09:28:57 +02:00
Ben Ogle 8534e12523 Add tooltip `viewport` option, respect bounds of the viewport 2014-03-21 11:28:13 -07:00
Chris Rebert 7cf7e42c67 Merge branch 'hnrch02-modal-toggle' 2014-03-16 20:24:59 -07:00
Heinrich Fenkart 4e4e456341 Fix #12845 - Modal#hide should only be called with an event argument 
Closes #12850
 2014-03-16 20:24:33 -07:00
Jacob fa4379de08 Merge pull request #12862 from sultano/patch-1 
Fixed flickering and simplified calculations
 2014-03-16 20:24:21 -07:00
Zlatan Vasović ead17b7ca6 Fix #12375: stop using document.body.scrollTop as it's deprecated in the strict mode 
Closes #12377
 2014-03-16 20:10:52 -07:00
Tobias Lindig 0f366e0376 correct event naming of `scroll` and `load' event 
closes #12337
 2014-03-16 19:58:12 -07:00
fat 615dcb5ca0 fixes #9855 2014-03-16 18:38:47 -07:00
Julian Thilo 6d882a6420 Fix JSHint errors 
X-Ref: 8c9739d477
 2014-03-14 18:16:36 +01:00
Chris Rebert b50d4a176f Merge pull request #13060 from twbs/role-tooltip 
add role="tooltip" to tooltips by default to improve accessibility
 2014-03-13 21:50:01 -07:00
Jacob 905c78129f Merge pull request #11937 from IHomer/master 
Fix: IE10 or lower incorrectly determines the scrollheight of the body. ...
 2014-03-13 21:45:04 -07:00
Jacob 8c9739d477 Merge pull request #11453 from moodyroto/patch-1 
fix scrollspy for targets within tabs
 2014-03-13 21:44:05 -07:00
Chris Rebert 8a6cdff825 add role="tooltip" to tooltips by default to improve accessibility 
See https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#tooltip
 2014-03-13 15:05:13 -07:00
Chris Rebert 6dd51fab44 fix #12771 2014-03-10 00:06:38 -07:00
XhmikosR 9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
fat 4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
fat e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Chris Rebert 297303a7cc use quotes around all element attr vals in JS; fixes #12946 2014-03-06 11:12:17 -08:00
XhmikosR 2545073024 Move `trailing` check to JSCS. 2014-02-28 17:30:08 +02:00
XhmikosR be8f125ce6 Move `camelcase` check to JSCS. 2014-02-28 17:30:08 +02:00
XhmikosR 2619325626 JSCS: Use more style checks. 2014-02-28 17:30:08 +02:00
XhmikosR d65f749390 Move the quotes check to JSCS. 2014-02-28 17:30:08 +02:00
XhmikosR 537e10033e Switch to using JSCS for the indentation check. 2014-02-28 17:30:08 +02:00
Suleman Chikhalia f7c360d620 Fixed flickering and simplified calculations 
- Removed offending line causing a flicker to the default top state
- Simplified calculation of the top offset when in the bottom state
 2014-02-27 00:39:46 -08:00
XhmikosR 63031a3ca5 Bump grunt-jscs-checker. 2014-02-26 19:32:43 +02:00
jonahss 7a80b801d7 updated qunit test reporting so sauce labs can report failing tests 2014-02-21 18:54:50 -08:00
Mark Otto 70b875ceb3 Merge pull request #12761 from hnrch02/no-event-aliases 
Remove event aliases from JavaScript
 2014-02-21 15:14:22 -08:00
XhmikosR 25d047ded4 Merge pull request #12058 from ZDroid/uti 
Remove semicolons from JS tests
 2014-02-18 13:21:05 +02:00
Zlatan Vasović a4dac463e0 Improve `js/tests/index.html` 
- Improve comments.
- Remove `transition.js` script load as `transition.js` unit test doesn't exist.
 2014-02-18 10:43:24 +01:00
Zlatan Vasović a06e15dd36 Remove semicolons from JS tests 2014-02-17 20:56:46 +01:00
Chris Rebert 8eeab63e7e Merge pull request #12720 from twbs/reident-test-files 
Reindent test files
 2014-02-16 12:13:04 -08:00
Heinrich Fenkart 8a78bc065f Remove event aliases from JavaScript 
Makes life for people with custom jQuery builds excluding event aliases much easier.
 2014-02-16 21:00:04 +01:00
XhmikosR 5566c935f2 Merge pull request #12513 from ZDroid/jshint 
Remove `curly: false` from `.jshintrc`
 2014-02-16 20:45:00 +02:00
Zlatan Vasović 69cb7be07f Remove `curly: false` from `.jshintrc` 2014-02-16 19:30:02 +01:00
XhmikosR 895b0006b9 Re-indent test files. 2014-02-14 11:02:03 +02:00
Mark Otto 88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
XhmikosR 8939268a33 Update jQuery to v1.11.0. 
Also, use Google's CDN per #11369.
 2014-01-30 20:50:17 +02:00
Mark Otto 1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Tobias Lindig 084f0fb113 add namespace `.bs` also to the event `dismiss.modal` 2014-01-17 12:16:53 -08:00
Tobias Lindig 7fab3c30f2 remove needless space character 2014-01-17 13:34:03 +01:00
Chris Rebert 6af0013ac5 Revert "Add tooltip `viewport` option, respect bounds of the viewport" 
This reverts commit edb221a20c.
Reverting due to broken JS unit tests.

Conflicts:
	docs/javascript.html
 2014-01-16 20:32:59 -08:00
Mark Otto 03f4534307 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport 
Conflicts:
	docs/javascript.html
 2014-01-16 20:01:28 -08:00
fat 4bd6a52562 add missing paren 2014-01-16 14:28:21 -08:00
fat 82ff4e2e40 tooltip subpixel test fixes 2014-01-16 14:25:28 -08:00
fat 3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
fat 2f76821a4d new qunit 2014-01-16 13:33:09 -08:00
Islam Sharabash ad64b0acc8 Fixing js error in IE9 where no transition is supported 2014-01-16 10:11:59 -08:00
Chris Rebert b260d93c58 more detailed QUnit test results in Sauce 2014-01-14 20:21:15 -08:00
Ben Ogle edb221a20c Add tooltip `viewport` option, respect bounds of the viewport 2014-01-14 17:42:29 -08:00
Chris Rebert dde38280f7 upgrade to QUnit v1.0.0 2014-01-13 19:21:07 -08:00
Chris Rebert bfe74f7b2f Revert accidental overzealousness from 16eccc43d9 
Let's not confuse the archaeologists & historians.
 2014-01-13 19:09:51 -08:00
Chris Rebert c9ba678b9f JSCS can be dumb sometimes 2014-01-08 12:37:10 -08:00
Chris Rebert 5f328dce88 Merge pull request #12057 from ZDroid/nl 
'use strict' on new line
 2014-01-07 00:31:27 -08:00
Julian Thilo 7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Kevin Sawicki 5141e4da10 Use $ instead of jQuery 2014-01-03 14:39:18 -08:00
Zlatan Vasović 0f060e7bc4 'use strict' on new line 2014-01-01 15:42:41 +01:00
Zlatan Vasović 1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
fat 2a0b99104c Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles 
Conflicts:
	js/dropdown.js
 2013-12-29 19:23:15 -08:00
fat 8a62f21113 fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active') 2013-12-29 19:01:32 -08:00
fat 76f0d0ff32 fixes #11373 - adds related target to dropdown events 2013-12-29 18:57:22 -08:00
fat 162d9e1776 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top 
Conflicts:
	dist/js/bootstrap.min.js
 2013-12-29 18:04:43 -08:00
fat 9d73d9c38c Merge branch 'master' of github.com:twbs/bootstrap 2013-12-29 17:54:40 -08:00
fat ce4a2e4352 fixes #11288 - Vertical scroll position of modal saves between openings 2013-12-29 17:53:59 -08:00
Jacob ea40e7999d Merge pull request #11203 from jasny/patch-1 
Scrollspy acting up when targets are hidden
 2013-12-28 22:06:26 -08:00
fat 5bf13914e4 fixes #10658 jQuery Popover content loses bound events on second setContent call. 2013-12-28 20:59:45 -08:00
fat c595db19ff fixes #10911 - add loading event for use with remote option :| 2013-12-26 20:26:27 -08:00
fat d21369c1ed fixes #10890 2013-12-26 19:40:18 -08:00
fat 3c73904e17 update tool/pop destroy placement 2013-12-26 18:27:43 -08:00
Jacob 6baf266cda Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy 
don't create new Tooltip/Popover objects just to destroy them immediately
 2013-12-26 18:25:29 -08:00
fat 39091b0748 nope 2013-12-26 18:18:53 -08:00
Jacob bf3c525d05 Merge pull request #11496 from satazor/patch-1 
Clear timeout on destroy.
 2013-12-26 18:18:09 -08:00
fat 34fb5767cb fixes #10798 2013-12-26 17:53:31 -08:00
Jacob 37bfd8fa60 Merge pull request #10801 from Travesty3/master 
Add 'collapse' class back after expanding
 2013-12-26 17:50:41 -08:00
Jacob bea46fca70 Merge pull request #10834 from Prinzhorn/master 
Only preventDefault on click on [data-toggle="modal"] when the element is a link
 2013-12-26 17:46:59 -08:00
Mark Otto d8e4c1578d Merge pull request #12010 from ZDroid/wrong-indent 
Fix wrong indent in .jscs.json
 2013-12-26 12:54:23 -08:00
fat fc7049b18f fixes #10675 2013-12-25 20:33:05 -08:00
fat c25fa0661a Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix 
Conflicts:
	js/tooltip.js
 2013-12-25 20:03:28 -08:00
Zlatan Vasović 1e05029d1a Fix wrong indent in .jscs.json 2013-12-25 20:22:52 +01:00
fat dffd4ffad2 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-24 17:00:55 -08:00
fat 394e0fa611 fixes #11788 - focusin focusout instead of focus/blur 2013-12-24 17:00:34 -08:00
Jacob 0fab6e7ea7 Merge pull request #11722 from DocX/patch-1 
Use document scroll height instead of offset height
 2013-12-24 16:43:24 -08:00
fat c77740bd3a fixes #11720 - Add events trigger to affix 2013-12-24 16:29:51 -08:00