79 Commits

Author	SHA1	Message	Date
fat	834220ea20	bootstrap onto closure	2015-02-11 11:29:43 -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
Mark Otto	c683e7dea7	bump versions	2015-01-19 08:32:13 -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	c7ef5810e1	rename .item => .carousel-item	2014-12-17 18:44:55 -08:00
Chris Rebert	b7398bc9c4	honor wrap option in Carousel.getItemForDirection; fixes #15144	2014-11-15 22:43:20 -08:00
Mark Otto	9a7e365c2c	bump version to v3.3.1	2014-11-12 09:03:16 -08:00
Chris Rebert	469dc3ab1f	Have Carousel ignore keyboard events from <input>s or <textarea>s; fixes #14991	2014-11-04 16:23:44 -08:00
Mark Otto	94b59b57d6	version bump	2014-10-29 08:56:20 -07:00
Ben-Russell	68b771a057	Independently delegate data-api selectors ... Fixes #14462. Closes #14463 by merging it.	2014-10-29 04:54:53 +01:00
Heinrich Fenkart	038a63b0eb	Add keyboard option to carousel ... Also adds unit tests for keyboard events. Fixes #14468.	2014-10-03 05:16:31 +02:00
Heinrich Fenkart	c37c1a6743	Only enable pause: hover for non-touch browsers ... Fixes #11967.	2014-09-23 23:34:58 +02:00
Jacob	8bf48121a0	Merge pull request #14061 from hnrch02/fix-13656 ... Expose transition durations on plugin constructors; closes #13656	2014-08-01 12:50:03 -07:00
Chris Rebert	cbba8e53df	Fix #13818 by using more robust "find next carousel item" logic ... Also adds another test for #9461: carousel next/prev should ignore non-items	2014-07-31 11:36:24 -07:00
Heinrich Fenkart	231744d628	Expose transition durations on plugin constructors; closes #13656	2014-07-07 13:03:56 +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
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
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
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
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
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
Chris Rebert	e114727ae9	Carousel.slide: rename e => slideEvent	2014-04-25 17:50:38 -07:00
Chris Rebert	4bd29bfcff	change 'slid' comments per @fat's feedback	2014-04-25 17:48:02 -07:00
Chris Rebert	4d0a8e31a4	Add direction & relatedTarget properties to slid.bs.carousel event ... Fixes #13393	2014-04-24 19:02:47 -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
Chris Rebert	26f6807a3d	Add comments in carousel.js to clarify that "slid" is not a typo ... Addresses #13248.	2014-03-31 18:09:24 -07:00
fat	4a2d337bf5	fixes #9461 - Make carousel ignore non-items in carousel-inner	2014-03-24 19:23:39 -07: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
Islam Sharabash	ad64b0acc8	Fixing js error in IE9 where no transition is supported	2014-01-16 10:11:59 -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
fat	8a62f21113	fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')	2013-12-29 19:01:32 -08:00
fat	fe7fffe034	Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset ... Conflicts: js/tests/unit/carousel.js	2013-12-24 12:50:55 -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