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
Quentin Spencer-Harper
acc5f65756
Tooltip: Avoid creating an unnecessary tooltip when Tooltip#hide is called
...
Fixed performance bug where a tooltip element is created and then immediately destroyed when tooltip.hide() is called and there is no existing tooltip element
Resolves #15557 by merging it.
2015-02-26 06:53:58 +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
Heinrich Fenkart
cac6cfcd84
Merge pull request #15923 from kkirsche/useExplicitVariableDeclaration
...
[Ref #15881 ] Use Explicit JS Variable Declarations rather than Chained
2015-02-26 05:55:27 +01:00
Chris Rebert
a339bfb0ac
Merge pull request #15693 from huang-x-h/patch-1
...
tip method in popover.js can be removed
2015-02-25 19:49:26 -08:00
Kevin Kirsche
238be65786
[Ref #15881 ] Use Explicit Values rather than Chain
...
[Ref #15881 ] Use Explicit Values for javascript variables rather than chained ones.
From https://github.com/twbs/bootstrap/pull/15881#discussion_r25330647
2015-02-25 12:19:11 -05: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
Heinrich Fenkart
6e0c843223
ScrollSpy: Small style consistency adjustments
2015-02-25 01:37:13 +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
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
Heinrich Fenkart
16479e9051
Merge pull request #15378 from twbs/fix-ie-modal-scrollbar-for-realz
...
Modal: Work around IE scrollbars not taking up page width
2015-02-24 03:33:32 +01:00
fat
1e9e3316b6
kill affix
2015-02-11 11:40:57 -08:00
fat
834220ea20
bootstrap onto closure
2015-02-11 11:29:43 -08:00
dormouse
91b384399c
tip method in popover.js can be removed
...
Popover is extend Tooltip, the tip function can use tootltip's tip, so we can remove the tip function definition in popover to reduce the js filesize
tip function definition in tooltip.js https://github.com/tbs/bootstrap/blob/master/js/tooltip.js#L405-L407
2015-01-29 11:21:07 +08:00
Chris Rebert
cd4467b194
Merge pull request #15496 from twbs/15484-alternative
...
Make $(document).tooltip({...}) without a `selector` throw an error
2015-01-28 11:05:40 -08:00
Chris Rebert
af8fa54fcd
Merge pull request #15630 from twbs/tabs-cond-fix
...
Fix error in condition in Tab plugin
2015-01-28 10:59:51 -08:00
Chris Rebert
ebedeaf2fe
Fix name of Tooltip.replaceArrow() parameter
...
isHorizontal => isVertical
2015-01-27 11:15:55 -08:00
Chris Rebert
eaaaa00520
Integrate mq4-hover-hover-shim
2015-01-22 11:37:37 -08:00
Chris Rebert
426e8e12cd
Fix error in condition in Tab plugin
...
Refs #15186
2015-01-21 14:13:26 -08:00
Chris Rebert
9238337cbb
Merge branch 'master' into v4
2015-01-21 13:00:12 -08:00
Chris Rebert
1652efc3f6
tweak 'close reopened modal' unit test to work under new QUnit API
2015-01-20 20:18:33 -08:00
Chris Rebert
df73535a2d
fix bug in tab show/shown relatedTarget unit test
2015-01-20 20:16:42 -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
Mark Otto
325748ff68
Merge branch 'master' into v4
...
Conflicts:
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.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.css.map
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/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
2015-01-19 14:48:12 -08:00
XhmikosR
a8139a0392
Update QUnit to v1.17.0.
2015-01-19 20:10:34 +02:00
Mark Otto
c683e7dea7
bump versions
2015-01-19 08:32:13 -08:00
XhmikosR
0481ce973f
Fix bogus JSCS warning.
2015-01-16 17:50:05 +02:00
XhmikosR
0e79fe1a9f
Update JSCS config for the new version.
2015-01-16 17:49:58 +02:00
XhmikosR
9db1de2a3a
Update jQuery to v1.11.2.
2015-01-07 00:31:18 +02:00
Chris Rebert
34f88e94fc
window.Document doesn't exist in IE8
2015-01-05 14:47:33 -08:00
Chris Rebert
f6a837cbf1
Make $(document).tooltip({...}) without a selector throw an error
...
Closes #15484
2015-01-05 14:22:49 -08:00
Mark Otto
0e5d17d5f6
Merge branch 'master' into v4
...
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
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/input-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/page-header.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/code.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/javascript.html
docs/_jade/customizer-variables.jade
docs/_layouts/default.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/customize.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/glyphicons.less
less/mixins/vendor-prefixes.less
less/navbar.less
less/popovers.less
less/tables.less
less/theme.less
less/tooltip.less
less/variables.less
package.json
scss/_carousel.scss
scss/_close.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
2015-01-03 20:08:58 -08:00
Zlatan Vasović
576230b92a
Happy New Year 🎅
2015-01-01 01:23:48 +01:00
Chris Rebert
adaabab81b
Revert "Allow multiple delegated tooltip selectors on a node"
...
This reverts commit 1b3237629a316af41945e20837cf3a332798b264.
This reverts PR #14189 because it caused major regressions.
Fixes #15168 .
We'll try to revisit #14167 's feature request in Bootstrap v4.
[skip validator]
2014-12-29 20:08:22 -08:00
Chris Rebert
32cb071594
Remove semicolons from #15425 because fat
2014-12-29 18:34:35 -08:00
Chris Rebert
27bfef5b35
Add regression test for #14244 .
...
Special thanks to @programcsharp
[skip validator]
2014-12-29 16:09:37 -08:00
