rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
10,175 Commits 108 Branches 89 Tags 552 MiB
0521913a99
Commit Graph

842 Commits

Author SHA1 Message Date
Jacob
c22b270582 Merge pull request #14273 from sgonyea/master 
Fix hover-popover/tooltip flickering when mouse re-enters
 2014-09-07 10:36:45 -07:00
Scott Gonyea
aac0e16452 Fix hover-tooltip flickering when mouse re-enters 
- is(':visible') seems to be the only reliable check, without a refactoring of how hoverState is used
- tests need improvement
 2014-08-28 17:17:50 -07:00
XhmikosR
d869a5fb62 Update QUnit to v1.15.0. 2014-08-28 09:38:53 +03:00
Mark Otto
875006d08c Merge pull request #14417 from twbs/fat-14282 
fixes #14282 - Already Visible collapse gets closed when …
 2014-08-23 12:58:24 -07:00
Chris Rebert
9efedf8f7b Merge pull request #14406 from twbs/nav-tag-for-navbar 
consistently use <nav> instead of <div> for .navbar in docs
 2014-08-20 21:48:59 -07:00
Jacob
c95aa97c03 Merge pull request #14244 from programcsharp/master 
Remove popover content with .children().detach() instead of .empty()
 2014-08-18 20:06:02 -07:00
fat
9c2e54bfec fixes #14282 - Already Visible collapse gets closed when .collapse('show') is called 2014-08-18 19:58:19 -07:00
Chris Rebert
ea0e1606dc Assume Element.getBoundingClientRect() exists; Fixes #14093 
[skip validator]
 2014-08-17 16:08:49 -07:00
Chris Rebert
6b7142212f consistently use <nav> instead of <div> for .navbar in docs 2014-08-15 18:09:05 -07:00
Heinrich Fenkart
436015c191 Collapse: count .collapsing elements as actives; closes #13447 2014-08-08 01:23:50 +02:00
Heinrich Fenkart
75bffd84ae Use closest .alert for alert dismissal; closes #14306 2014-08-04 19:33:42 +02:00
Heinrich Fenkart
dca8afa333 Remove aria-describedby attribute later 
Fixes #14241
 2014-08-04 19:21:49 +02:00
Jacob
8bf48121a0 Merge pull request #14061 from hnrch02/fix-13656 
Expose transition durations on plugin constructors; closes #13656
 2014-08-01 12:50:03 -07:00
Chris Rebert
08393bf68a Fix #14076: Add unit test for tooltips on SVG elements 
[skip validator]
 2014-08-01 12:10:00 -07:00
Chris Rebert
cbba8e53df Fix #13818 by using more robust "find next carousel item" logic 
Also adds another test for #9461: carousel next/prev should ignore non-items
 2014-07-31 11:36:24 -07:00
Heinrich Fenkart
18c0a1c977 Revert "Use mousedown instead of click for backdrop click detection; fixes #13816" 2014-07-30 23:54:25 +02:00
Chris Hynes
531fc80885 Use .end() to remove extra line 2014-07-25 11:10:46 -07:00
Chris Rebert
c2f4e5fef1 re-alphabetize .jscsrc 2014-07-25 11:02:30 -07:00
Chris Hynes
519a087dbe Remove popover content with .children().detach() instead of .empty() so it can be reused 2014-07-25 10:16:44 -07:00
Artem Belov
098242afd8 Delete duplicate JSCS properties 2014-07-25 15:03:07 +04:00
Jacob
36483af92c Merge pull request #14207 from twbs/charlesbjohnson-affix-bottom-when-dynamic-height 
Charlesbjohnson affix bottom when dynamic height
 2014-07-21 22:48:38 -07:00
fat
4775c9296a Merge branch 'dropdown-aria' of git://github.com/mckramer/bootstrap into mckramer-dropdown-aria 
Conflicts:
	docs/_includes/js/dropdowns.html
 2014-07-21 22:44:35 -07:00
fat
eff9b063da cleanup style 2014-07-21 22:37:04 -07:00
Charles B Johnson
724c4f526c Fix issue where bottom affixed element floats over the footer when the 
document height is smaller than the viewport height.
 2014-07-18 10:46:42 -04:00
Charles B Johnson
8c0eb9b00e Refactor determining affix state into a separate expanded method 
in order to handle multiple edge cases, specifically when the document
  height is dynamic.
Always reposition an affix that is affixed to the bottom.
 2014-07-18 10:45:59 -04:00
Charles B Johnson
d3dea01a11 Add a bottom affixed element to affix visual tests. 2014-07-18 10:45:59 -04:00
Jacob
866ffc4f37 Merge pull request #14055 from twbs/fat-speed-up-tests 
speed up js tests a bit
 2014-07-17 10:07:28 -07:00
fat
9b90b87099 speed up js tests a bit 2014-07-16 22:22:42 -07:00
Heinrich Fenkart
cc7fab893d Follow-up to #13907: simplify JS logic for focus shim 2014-07-16 08:44:56 +02:00
Heinrich Fenkart
1719d2b051 document.head is undefined in IE8 2014-07-09 00:42:02 +02:00
Heinrich Fenkart
0268b41c4f Fix IE8 reporting type object for getBoundingClientRect 2014-07-09 00:42:02 +02:00
Heinrich Fenkart
05ddea314c Fix IE8 reporting height style as all uppercase 2014-07-09 00:42:02 +02:00
Chris Rebert
21571b3412 Fix invalid HTML in "should allow html entities" tooltip unit test 
Refs #14090.
Also, fix one typo.
 2014-07-08 14:40:20 -07:00
Heinrich Fenkart
231744d628 Expose transition durations on plugin constructors; closes #13656 2014-07-07 13:03:56 +02:00
Mark Otto
907b3b2892 Merge pull request #13907 from twbs/fat-12145 
add "focus" to focused btns with button plugin
 2014-07-07 00:36:59 -07:00
fat
587c09cb48 fix scrollspy test in firefox mac os 2014-07-06 21:50:46 -07:00
Jacob
b5d86ad0bd Merge pull request #13853 from hnrch02/unit-tests-cleanup 
Major unit tests cleanup
 2014-07-06 21:43:48 -07:00
Mark Otto
44f83fff90 Merge pull request #14021 from CFXd/add_collapsed_default_class_to_navbar_collapse_button 
Add collapsed default class to navbar-toggle
 2014-07-06 16:37:42 -07:00
Mark Otto
ac18e5811d jscs fix 2014-07-06 15:08:33 -07:00
fat
cb19f4f227 Merge branch 'breaddevil-replace-scrollspy-default-behavior-test' 2014-07-06 14:11:38 -07:00
fat
b19719ea1a Merge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil/bootstrap into breaddevil-replace-scrollspy-default-behavior-test 
Conflicts:
	js/tests/unit/scrollspy.js
 2014-07-06 14:11:23 -07:00
Jacob
279c46152b Merge pull request #13815 from hnrch02/tabs-fade-not-active 
Allow tabs to fade in if no initially active pane is present
 2014-07-06 13:50:54 -07:00
Heinrich Fenkart
58eb8b2ae3 Move to leading pluses 2014-07-06 11:56:12 +02:00
Chris Rebert
a34e52de4d Merge pull request #14015 from twbs/possible-14013-fix 
Possible fix for #14013
 2014-07-06 00:36:52 -07:00
Heinrich Fenkart
dad56be96c Move to 16ms from 18ms based on the Paul Irish's rAF polyfill 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
8ff099585f Mention #13500 in comment for ScrollSpy test 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
e341355d28 Clean tooltip unit tests up 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
b3a125e941 Clean tab unit tests up 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
05ba1e491e Clean scrollspy unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
56b8d5fe6e Clean popover unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
998c3724e8 Clean modal unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
9ff66a12bc Clean dropdown unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
77d0557468 Clean collapse unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
6a523bf99d Clean carousel unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
f3345f68d7 Clean button unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
b063de54a5 Clean alert unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
95d7c9c3fb Clean affix unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
4950fe6f4e Perform a cleanup after each test 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
1e64c4c0ba Update QUnit settings/QUnit phantomjs bridge to new versions 2014-07-06 09:24:22 +02:00
Chris Rebert
f9ffb49932 refactor/reformat Tooltip.getPosition per @fat's feedback 2014-07-06 00:16:54 -07:00
Jacob
5830febd9a Merge pull request #13855 from hnrch02/modal-mousedown 
Use mousedown instead of click for backdrop click detection; fixes #13816
 2014-07-06 00:01:57 -07:00
Jacob
13a4c50cc7 Merge pull request #14000 from hnrch02/modal-keydown 
Only close modal if escape was hit with keydown; fixes #13929
 2014-07-05 23:55:36 -07:00
fat
c08e275000 fix build 2014-07-05 23:49:45 -07:00
fat
22f851fa62 apply #14022 without semicolon – cleans up some jquery class usage 2014-07-05 23:28:44 -07:00
Wing
4b08832308 no need to create $.Event 
`trigger()` can handle string argument
 2014-07-03 10:52:22 -07:00
Wing
48b822db40 trigger 'affixed.bs.affix' instead of 'affixed' 
Original is triggering `affixed` not `affixed.bs.affix`, only `.on('affixed.bs.affix', ...)` also catch `affixed` event.

Closes #13998.
 2014-07-03 10:52:22 -07:00
Michael Silber
1e407c81f1 Add collapsed default class to navbar-toggle 2014-07-02 16:49:03 -04:00
Chris Rebert
1ce5e9f3ae possible fix for #14013 2014-07-02 10:09:28 -07:00
Heinrich Fenkart
91f329e448 Only close modal if escape was hit with keydown; fixes #13929 2014-07-01 05:50:31 +02:00
Heinrich Fenkart
121bf6633e Use mousedown instead of click for backdrop click detection; fixes #13816 2014-07-01 02:53:57 +02:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
sgamel
9445b84b0b Ensure that hidden event is sent when content is really hidden (collapsing class is removed) 2014-06-26 10:18:45 +02:00
Heinrich Fenkart
282f8fc04b Add a few more cases to the visual test tab page 2014-06-25 04:18:51 +02:00
Heinrich Fenkart
634ea59a25 Allow tabs to fade in if no initially active pane is present; fixes #13814 2014-06-25 04:18:51 +02:00
fat
6b6476fcd9 add "focus" to focused btns with button plugin 2014-06-23 23:39:54 -07:00
fat
0aa01f63e3 Merge branch 'master' into fix-13386 
Conflicts:
	js/carousel.js
 2014-06-23 23:08:23 -07:00
Chris Rebert
c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -07:00
Heinrich Fenkart
587451ad9a Update a few source files to comply to new JSCS rules 2014-06-19 21:08:05 +02:00
Heinrich Fenkart
09c2e41ec4 Remove deprecated JSCS rules and add requireSpaceAfterLineComment 2014-06-19 21:08:05 +02:00
Erwan Jegouzo
1b63d0b9ba fix for #13747 
Closes #13782 by merging it.
 2014-06-17 17:56:15 -07:00
Chris Rebert
f071549c84 fix #13386 2014-06-13 12:12:32 -07:00
fat
2b302f69ee some changes from #13801 - add strict mode back and == 2014-06-12 11:11:04 -07:00
Jacob
696632d7da Merge pull request #13786 from twbs/fat-13430 
add special transitionend type to test event origin
 2014-06-11 22:44:04 -07:00
Heinrich Fenkart
e9d6756a1a Fix regression of #10038 introduced by #13772 2014-06-12 06:00:02 +02:00
Jacob
6ac5708a0d Merge pull request #13787 from twbs/fat-3731 
fix #13185 - keyboard support for carousel
 2014-06-11 15:19:39 -07:00
fat
7f122be004 add special transitionend type to test event origin 
fixes #13430
 2014-06-10 20:42:19 -07:00
fat
a1dad14f44 fix #13185 - keyboard support for carousel 2014-06-10 20:35:03 -07:00
fat
571fd32bce fix #13220 Scrollspy generates wrong offsets for a page-- recalculate offsets if scrollheight changes 2014-06-10 17:38:42 -07:00
Katie Zhu
1c6fa9010d MD/CommonJS/Globals #12909 2014-06-10 17:16:29 -07:00
Katie Zhu
5eaedbe097 change how carousel indicators activate #12592 2014-06-09 21:59:03 -07:00
Jacob
fe74a8bb3e Merge pull request #13755 from twbs/fat-visual-test 
Adds isolated visual tests for javascript plugins (decoupled from docs)....
 2014-06-08 16:05:08 -07:00
fat
91103e6d1f Adds isolated visual tests for javascript plugins (decoupled from docs). This makes it 
faster and easier to test/develop js functionality not represented in unit tests, and gives us
a playground for interactions, etc.

It also makes it so developing javascript is now decoupled form jekyll, which should make everything
faster and less painful.

This commit also reverts my filter commit 9900771aa7
which broke scrollspy for dropdowns.
 2014-06-07 19:11:44 -07:00
Mike Greiling
1cfa902e31 refactor scrollspy refresh method 
Closes #13702 by merging a rebased version of it.
 2014-06-07 18:26:39 -07:00
Mike Greiling
bc8e6ffb7d removing this.$element as it is a superfluous copy of this.$scrollElement 2014-06-07 18:09:53 -07:00
Mike Greiling
632313d631 no need to check for href attribute on the scrollable element 2014-06-07 18:09:53 -07:00
Mike Greiling
0be4109688 there is no need for this.offsets and this.targets to be jQuery objects 2014-06-07 18:09:53 -07:00
Chris Rebert
21de05c8c0 don't show tooltips/popovers whose element isn't in the DOM; fixes #13268 2014-06-07 17:54:11 -07:00
Chris Rebert
b23ed1b034 put the tooltips into the DOM in the tooltip unit tests 2014-06-07 17:54:11 -07:00
Chris Rebert
20c099d41a add failing test for #13268 2014-06-07 17:54:10 -07:00
XhmikosR
3b99a41246 Merge pull request #13388 from twbs/xhmikosr-js-style 
Improve JS style
 2014-06-07 09:13:05 +03:00