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

55 Commits

Author SHA1 Message Date
Johann-S
9b8356ba52 Collapse - Allow to pass jQuery object or DOM element to the parent option 2017-09-25 13:23:13 +02:00
Johann-S
5a90b4aa3e Collapse - preventDefault only on <a> elements not inside the collapsible
element
2017-08-25 09:48:35 +01:00
XhmikosR
ef8c77d8dc Tweak ESLint rules. 2017-08-23 00:05:38 +03:00
Johann-S
f0124769c9 Collapse supports multi-target thanks to @vanduynslagerp (#22713) 2017-06-14 13:21:49 +02:00
Pierre Vanduynslager
ab39defe74 Detach accordion from card without requiring 'data-children' 2017-04-25 09:32:14 +02:00
Patrick H. Lauke
18e8704221 Fix collapse.js aria-expanded behavior
* Remove aria-expanded from collapse.js target element

aria-expanded="true"/aria-expanded="false" only applies to the trigger,
not the element that is being expanded/collapsed.

* Tweak collapse.js accessibility section

...to make it clearer that the aria-expanded attribute always just goes
on the control.

* Fix collapse.js unit tests

- reword some of the text to make it clear we're checking behavior of
trigger/control
- move incorrect aria-expanded out of the <div>s and to the actual
trigger/control <a>s
- fix incorrect test assertion text output false -> true
2017-04-10 14:51:22 +01:00
Johann-S
fb42d6e043 Collapse - Fix check to not prevent event for input and textarea 2017-03-29 00:10:27 +02:00
Johann
24924c23b2 Collapse - do not prevent event for input and textarea 2017-03-27 10:08:39 +02:00
Pierre Vanduynslager
37f438910f Accordion behavior with JQuery interface (#21726)
Fix accordion behavior with JQuery interface
2017-03-23 21:15:41 +01:00
Johann-S
21b537cc24 Add unit test 2017-03-09 11:08:47 +01:00
Starsam80
bf39bb3ac3
Rename .active to .show 2016-12-07 21:20:15 -07:00
Bardi Harborow
c2616fb74e Make JS compliant with the new ESLint rules. 2016-11-24 11:59:55 +11:00
Johann-S
9d129a43d6 Use a single class name for opened/expanded/shown state of widgets 2016-10-25 14:07:41 +02:00
Johann-S
9bc7de9395 Fix bug multiple accordions collapse 2016-10-19 09:35:48 +02:00
Johann-S
de1255b14e Collapse using card component 2016-10-11 13:25:36 +02:00
Mark Otto
4d725c90d6 Merge pull request #17568 from Johann-S/fixCollapseHeight
[Fix #17555][V4] fix resetting style on closing collapse
2016-10-09 20:32:40 -07:00
Johann-S
21a65f181e Add throw error for undefined method on plugins 2015-10-02 10:01:24 +02:00
Johann-S
32f9a5d6a5 fix resetting style on closing collapse 2015-09-11 10:45:08 +02:00
fat
8bab38bb71 add collapse 2015-05-09 23:04:58 -07:00
fat
d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
Mark Otto
58082cd83e Merge branch 'master' into v4
Conflicts:
	.gitignore
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_includes/components/navbar.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/grid.html
	docs/_includes/css/overview.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/third-party-support.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/migration.html
	js/affix.js
	js/alert.js
	js/button.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tests/visual/modal.html
	js/tooltip.js
	less/component-animations.less
	less/jumbotron.less
	less/mixins/background-variant.less
	less/mixins/buttons.less
	less/mixins/responsive-visibility.less
	less/mixins/text-emphasis.less
	less/navbar.less
	less/navs.less
	less/scaffolding.less
	less/tooltip.less
	less/utilities.less
	less/variables.less
	package.json
	scss/_buttons.scss
	scss/_forms.scss
	scss/_modal.scss
2015-03-29 00:08:54 -07:00
Chris Rebert
d37bc2ae65 Merge pull request #15987 from twbs/fix-15972
add role="button" to a[data-toggle="collapse"]
2015-03-24 08:57:56 -07:00
Chris Rebert
725c6848c3 Disable jQuery event aliases when running test suite
To ensure that we don't accidentally use any of the aliases.
This should prevent any future regressions from #12761.
Also updates the test suite since it now can't use these aliases either.
2015-03-09 01:05:43 -07:00
Chris Rebert
5c8d56d515 Collapse unit test: rm check that no-op hide adds style="height: 0px"
Appears to be unnecessary and is broken by #16011,
which is otherwise quite sane.
2015-03-06 18:10:53 -08:00
Chris Rebert
872e56fcf2 .collapse('hide') on hidden uninit-ed collapsible no longer shows it; fixes #15315
Thanks to @peterblazejewicz & @Nikita240
Adds unit tests based on #14417
X-Ref: #14282
Closes #15807
2015-03-06 06:58:48 -08:00
Chris Rebert
cc39f5c52d add role="button" to a[data-toggle="collapse"]; fixes #15972 2015-03-03 13:18:36 -08:00
Kevin Kirsche
4febcb4b49 [Fixes #15953] Implement assert.expect in each unit test
[Fixes #15953] Implement `assert.expect` in each unit test
2015-03-03 08:45:07 -05:00
Mark Otto
c16fee5efd Merge branch 'master' into v4
Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/breadcrumbs.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Ivan Cheung
d5071b19f1 Update all collapse triggers with .collapsed class and aria-expanded
Fixes #15741
Closes #15751 by merging it.
2015-02-26 18:48:20 -08:00
Heinrich Fenkart
3bb05b5fbb Unit tests: Use new names of module hooks
Refs #15893
2015-02-26 08:20:42 +01:00
Chris Rebert
9c75c855c6 JS unit tests: equal() => strictEqual()
[skip validator]
2015-02-23 22:43:17 -08:00
Chris Rebert
118b8c2695 JS unit tests: use QUnit.module() & QUnit.test() everywhere
[skip validator]
2015-02-23 22:14:11 -08:00
Chris Rebert
7c19fee3f1 JS unit tests: use modern QUnit assert object everywhere 2015-02-23 22:14:11 -08:00
fat
834220ea20 bootstrap onto closure 2015-02-11 11:29:43 -08:00
Chris Rebert
b56d97f210 update JS unit tests to future-proof QUnit 1.16.0 API
[skip validator]
2015-01-20 19:57:51 -08:00
Heinrich Fenkart
ed3a65f084 Handle collapsed class on triggers even when manually invoked
Fixes #13636.
2014-10-29 04:34:05 +01:00
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
9b9e2f5d13 grunt and missing new line 2014-09-09 01:23:48 +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
fat
9c2e54bfec fixes #14282 - Already Visible collapse gets closed when .collapse('show') is called 2014-08-18 19:58:19 -07:00
Heinrich Fenkart
05ddea314c Fix IE8 reporting height style as all uppercase 2014-07-09 00:42:02 +02:00
Heinrich Fenkart
58eb8b2ae3 Move to leading pluses 2014-07-06 11:56:12 +02:00
Heinrich Fenkart
77d0557468 Clean collapse unit tests up 2014-07-06 09:24:22 +02:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03: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
cd4696f723 fixes #11099 - $.collapse() overrides the original dimension of the coll... 2014-04-15 21:16:40 -07:00
XhmikosR
45b476bdbf JS: remove unused variables. 2014-04-09 10:01:48 +03:00
Zlatan Vasović
a06e15dd36 Remove semicolons from JS tests 2014-02-17 20:56:46 +01:00
XhmikosR
895b0006b9 Re-indent test files. 2014-02-14 11:02:03 +02:00
XhmikosR
eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00