0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Commit Graph

725 Commits

Author SHA1 Message Date
Heinrich Fenkart
1e64c4c0ba Update QUnit settings/QUnit phantomjs bridge to new versions 2014-07-06 09:24:22 +02: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
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
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
Chris Rebert
3cbbc70d55 Merge pull request #13627 from twbs/maybe-fix-12364
Hopefully fixes trigger focus restoration on modal close
2014-06-06 15:59:17 -07:00
XhmikosR
e2cabe4971 Minor style tweaks. 2014-06-06 01:23:07 +03:00
XhmikosR
82fc03f3b6 carousel.js: remove unneeded variable assignment.
`slideIndex` is assigned to the same value a few lines above.
2014-06-06 01:23:07 +03:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
XhmikosR
5ef9383f53 Tweak JSHint and JSCS checks.
Be more consistent across the whole codebase.

Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
2014-06-06 01:23:06 +03:00
Chris Rebert
475dbe58b0 Merge pull request #13589 from mrobinet/scrollspy-maxScroll-with-offset
Adjust for Scrollspy offset when calculating maxScroll.
2014-05-23 14:36:05 -07:00
Chris Rebert
bc1ce426d9 Merge pull request #13593 from ResentedHook/master
Add tooltip self-reference to address #12320
2014-05-23 14:33:19 -07:00
Chris Rebert
ef62254917 Merge pull request #13557 from bassettsj/aria-describedby-tooltip-13480
Aria describedby tooltip: #13480
2014-05-23 14:11:15 -07:00
Chris Rebert
b058c018eb Hopefully a fix for #12364
* register the callback before invoking the toggling
* listen for `hidden` instead of `hide`
* account for the possibility of the associated `show` event being preventDefault-ed

Adds relevant unit tests.
2014-05-19 02:14:14 -07:00
Chris Rebert
e9b99d475c fix typo in assertion description 2014-05-19 00:47:06 -07:00
Chris Rebert
3d1723d689 add missing event namespacing in modal.js 2014-05-16 17:05:03 -07:00
Attila Dobi
f47ad79538 add target option to Affix plugin 2014-05-16 13:07:45 -07:00
Steven Bassett
a70da16f6f Adds aria described by to tooltip plugin for accessibility
Generates a unique id for tooltip and adds [aria-describedby] to the element
it is called on. Resolves issue #13480

- set up test
- linted the code styles
- passed the tests
- integrated feedback from @cvrebert
2014-05-16 10:45:38 -07:00
j.corns
122c05dbd8 Add tooltip self-reference to address #12320
primarily adds a data- attribute to the tooltip (and thus, the popover)
to create a self-reference.
2014-05-14 10:36:32 -07:00
Mike Robinet
c2e94eba8d Add Scrollspy maxScroll with offset test. 2014-05-13 12:53:54 -05:00