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

351 Commits

Author SHA1 Message Date
fat
2d91494d96 scrollspy es6 2015-05-11 12:05:35 -07:00
fat
ca9c850ebb add getters for Version and Default where applicable
add modal my gawd
2015-05-10 19:45:38 -07:00
fat
bbb97a8660 add dropdown 2015-05-10 13:47:11 -07:00
fat
8bab38bb71 add collapse 2015-05-09 23:04:58 -07:00
fat
1b183e2ff7 carousel -> es6 2015-05-07 22:26:40 -07:00
fat
6605051882 button -> es6 2015-05-07 17:14:38 -07:00
fat
0724bd91ff es6 alert :| 2015-05-07 12:57:31 -07:00
fat
d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
Chris Rebert
0d77644fc4 throw error when trying to show tooltip on :hidden element 2015-04-23 17:14:45 -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
6c5e7dfce1 rm redundant aria-hidden usage from Modals; fixes #16020 2015-03-25 18:06:47 -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
Emmanuel Bourgerie
fa9d28b634 Fix #16072: Clicking into input field within dropdown no longer closes the dropdown
Closes #16073 by merging it
2015-03-21 16:00:15 -07:00
Maxim Andrukhovych
83371735fc Fixed proper navigation element selection on backward scrolling (from the bottom to the top) 2015-03-10 20:04:15 +00: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
21d56378e1 Merge pull request #16011 from twbs/fix-15315
.collapse('hide') on hidden uninit-ed collapsible no longer shows it
2015-03-09 01:03:27 -07:00
Chris Rebert
a134491fe5 add togglable scrollbar-inducing content to Modal visual test 2015-03-07 06:40:57 -08:00
Chris Rebert
6ddb8c2dd7 add static navbar to Modal visual test 2015-03-07 06:39:46 -08:00
Chris Rebert
64ca888cbc Merge pull request #15999 from twbs/kkirsche-includeTestsReadme
Document JS test suite basics
2015-03-06 23:28:30 -08:00
Kevin Kirsche
ba2f7e92d0 [Fixes #15951] Document JS test suite basics
X-Ref: #15953
Closes #15952 by merging a tweaked version of it.
[skip sauce]
[skip validator]
2015-03-06 23:27:00 -08: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
27bbc7dbe9 Hiding an uninitialized tooltip/popover no longer initializes it; fixes #15874 2015-03-03 22:22:13 -08:00
Chris Rebert
cc39f5c52d add role="button" to a[data-toggle="collapse"]; fixes #15972 2015-03-03 13:18:36 -08:00
Heinrich Fenkart
420a8088a4 Merge pull request #15961 from kkirsche/ImplementAssertExpect
[Fixes #15953] Implement assert.expect in each unit test
2015-03-03 15:52:05 +01: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
Heinrich Fenkart
f5beebe726 Modal: Fix backdrop not readjusting when height changes
Fixes #15136.
Closes #15345.
Closes #15314.
Refs #14724, #14927.
2015-03-03 05:27:26 +01:00
Chris Rebert
46f5a8f478 Merge pull request #15970 from twbs/the-future-is-now-qunit
Disable deprecated QUnit global methods
2015-03-02 02:39:29 -08:00
XhmikosR
f8e34ff48b Disable es3 for tests and customizer.js. 2015-03-02 11:16:06 +02:00
Chris Rebert
c291c12cb1 Disable deprecated global QUnit method aliases to prevent backsliding on QUnit v2 readiness 2015-03-01 19:50:11 -08:00
Chris Rebert
c80872235f Merge pull request #15955 from twbs/fixture-on-screen-ios
Unit tests: Only display fixture on-screen for iOS
2015-03-01 18:28:46 -08:00
Chris Rebert
015e63f6df Merge pull request #15593 from neoeno/handle_multiple_zero_offset_scrollspy_elements
Handle multiple zero-offset Scrollspy elements.
2015-03-01 16:04:04 -08:00
Caden Lovelace
a1aa0f8afd Handle multiple zero-offset Scrollspy elements.
When the first two elements in a scrollspy content block have a document
offset of zero (i.e. they're hard against the top of the page),
Scrollspy would switch between them on every scroll event.

This could happen, for example, in a system of nested sections:

```
<section id="animals">
  <section id="dogs">
	Content
  </section>
</section>
```

This ocurred because Scrollspy's check to see if it's at the end of the
array of sections uses `!arr[index]`. This misses the case where
`arr[index]` does exist and is zero.

This commit explicitly checks the array bounds.
2015-03-01 23:55:39 +00: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
Heinrich Fenkart
20fb55a840 Unit tests: Only display fixture on-screen for iOS
Since only on iOS tests fail when the fixture is displayed off-screen, see https://travis-ci.org/twbs/bootstrap/jobs/52605742
2015-03-01 09:49:59 +01:00
Heinrich Fenkart
4345e24479 Use different way to make failing test more visible in Sauce 2015-03-01 09:20:00 +01: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
Chris Rebert
9afb61fffd QUnit.jsDump => QUnit.dump
Refs http://qunitjs.com/upgrade-guide-2.x/#replace-qunit-jsdump-with-qunit-dump
2015-02-25 23:29:27 -08:00
Chris Rebert
4ff9c54cdd Use QUnit.log(...) instead of QUnit.log = ...
Refs http://qunitjs.com/upgrade-guide-2.x/#replace-qunit-log-callback-with-qunit-log-callback-for-all-reporting-callbacks
2015-02-25 23:29:27 -08:00
Heinrich Fenkart
3bb05b5fbb Unit tests: Use new names of module hooks
Refs #15893
2015-02-26 08:20:42 +01:00
nakupanda
142a9e4ae0 Modal: Apply any preexisting body padding again after closing 2015-02-26 08:02:06 +01:00
vsn4ik
b395f3526e Dropdowns: Skip .disabled instead of .divider on keydown event
Fixes #15147.
Closes #15520 by merging it.
2015-02-26 06:42:09 +01:00
Chris Rebert
804457c474 fix 2 typos in modal unit test assertion messages 2015-02-24 23:49:08 -08:00
Heinrich Fenkart
c40c31a308 Dropdown unit tests: Tiny style changes 2015-02-25 02:53:39 +01:00
Chris Rebert
2a6207c0c9 Merge pull request #15904 from kkirsche/patch-8
Closes #15904
2015-02-24 14:11:03 -08:00
Kevin Kirsche
696fc2e53c Add unit test of aria-expanded to dropdown suite
Redo of #15876
2015-02-24 14:09:08 -08:00
Kevin Kirsche
30d8cdf639 Add tests for aria-hidden of modal
Add tests for `aria-hidden` of modal

Use strictEqual of 1 here instead of 2 asserts
2015-02-24 16:29:40 -05:00
Chris Rebert
ecd469ec16 Merge pull request #15893 from twbs/qunit-modern
Modernize QUnit usage by avoiding usage of global functions
2015-02-24 11:47:29 -08:00
Chris Rebert
9c75c855c6 JS unit tests: equal() => strictEqual()
[skip validator]
2015-02-23 22:43:17 -08:00
Chris Rebert
bda4fe87ca upgrade to QUnit v1.17.1
[skip validator]
2015-02-23 22:18:51 -08:00