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

70 Commits

Author SHA1 Message Date
Heinrich Fenkart
e811a24118 Don't fire show event if show is prevented because other element is still transitioning
Fixes #14844.
Closes #14845.
2014-10-22 04:25:05 +02:00
Heinrich Fenkart
40f889df2a Merge pull request #14353 from hnrch02/collapse-count-collapsing-as-active
Collapse: count `.collapsing` elements as actives; closes #13447
2014-09-13 02:28:25 +02:00
Patrick H. Lauke
fb1ca10b99 ARIA support for collapse
Added handling of aria-expanded=true/false to collapse.js, updated
documentation to include advice on making expand/collapse controls
accessible, updated examples and javascript documentation to use
aria-expanded and aria-controls (when targetting single collapsible
element, using ID rather than class selector)

Closes #14147.
Closes #14153.
2014-09-09 01:19:20 +02:00
Heinrich Fenkart
e4b55ded5c Merge pull request #13928 from SGinTech/sgit_collapseEventOrder
Ensure that hidden event is sent when content is really hidden (collapsi...
2014-09-08 23:12:27 +02:00
fat
9c2e54bfec fixes #14282 - Already Visible collapse gets closed when .collapse('show') is called 2014-08-18 19:58:19 -07:00
Heinrich Fenkart
436015c191 Collapse: count .collapsing elements as actives; closes #13447 2014-08-08 01:23:50 +02:00
Heinrich Fenkart
231744d628 Expose transition durations on plugin constructors; closes #13656 2014-07-07 13:03:56 +02: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
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
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
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
fat
7f122be004 add special transitionend type to test event origin
fixes #13430
2014-06-10 20:42:19 -07:00
Katie Zhu
1c6fa9010d MD/CommonJS/Globals #12909 2014-06-10 17:16:29 -07:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
fat
f219fee07b versions 2014-05-12 21:15:16 -07:00
Mark Otto
f20f66604b Merge pull request #11966 from colllin/noconflict
Fix #11464 - JS noConflict() mode not working in 3.0.x
2014-04-30 17:43:43 -07:00
Collin Donahue-Oponski
a9f2b6ce0f #11464 - Fix JS noConflict mode - Refactor all plugins to use an internal reference to the jQuery plugin, because in noConflict mode you can never expect to be defined on the jQuery object 2014-04-21 23:03:33 -06:00
fat
b9ae07d84a fixes #13157 - Collapse plugin - issues with transition end event bubbling 2014-04-21 17:35:29 -07:00
Jacob
b02d3c7eff Merge pull request #13306 from twbs/fat-11099
fixes #11099 - $.collapse() overrides the original dimension of the coll...
2014-04-20 12:12:17 -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
2b30b48894 Fix the new JSHint warnings. 2014-04-03 10:53:13 +03:00
fat
4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
Chris Rebert
297303a7cc use quotes around all element attr vals in JS; fixes #12946 2014-03-06 11:12:17 -08:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
fat
2f76821a4d new qunit 2014-01-16 13:33:09 -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
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
Jacob
37bfd8fa60 Merge pull request #10801 from Travesty3/master
Add 'collapse' class back after expanding
2013-12-26 17:50:41 -08:00
Mark Otto
679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
Chris Rebert
df3716647d update licensing header in JS files & run grunt 2013-12-18 15:29:19 -08:00
Mark Otto
e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
XhmikosR
eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Chris Rebert
f1b0cd491c Merge pull request #10039 from daguej/js-refs
Don't explicitly reference global jQuery
2013-11-05 16:55:55 -08:00
Chris Rebert
4e0d022de5 update version numbers in JS file comment headers to v3.0.1 & regrunt 2013-11-01 17:15:34 -07:00
Jared Christensen
583697fec3 JS comments pointed to new documentation 2013-10-29 12:10:47 -05:00
Zlatan Vasović
63433fbef9 Update license year 2013-10-22 18:41:33 +02:00
Travesty3
1c1850f63e Add 'collapse' class back after expanding 2013-09-25 08:59:01 -04:00
Josh Dague
f140084f2b Don't explicitly reference global jQuery
Removes `window.jQuery` in favor of `jQuery`, fixes #10038
2013-08-22 14:50:15 -04:00
Mark Otto
237640c706 Drop the accordion for the panel
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
2013-08-12 23:36:25 -07:00