root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity
11,936 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

963 Commits

Author SHA1 Message Date
Erwan Jegouzo 1b63d0b9ba fix for #13747 
Closes #13782 by merging it.
 2014-06-17 17:56:15 -07: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
Jacob 6ac5708a0d Merge pull request #13787 from twbs/fat-3731 
fix #13185 - keyboard support for carousel
 2014-06-11 15:19:39 -07: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
fat 571fd32bce fix #13220 Scrollspy generates wrong offsets for a page-- recalculate offsets if `scrollheight` changes 2014-06-10 17:38:42 -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
Jacob fe74a8bb3e Merge pull request #13755 from twbs/fat-visual-test 
Adds isolated visual tests for javascript plugins (decoupled from docs)....
 2014-06-08 16:05:08 -07:00
fat 91103e6d1f Adds isolated visual tests for javascript plugins (decoupled from docs). This makes it 
faster and easier to test/develop js functionality not represented in unit tests, and gives us
a playground for interactions, etc.

It also makes it so developing javascript is now decoupled form jekyll, which should make everything
faster and less painful.

This commit also reverts my filter commit 9900771aa7
which broke scrollspy for dropdowns.
 2014-06-07 19:11:44 -07:00
Mike Greiling 1cfa902e31 refactor scrollspy refresh method 
Closes #13702 by merging a rebased version of it.
 2014-06-07 18:26:39 -07:00
Mike Greiling bc8e6ffb7d removing this.$element as it is a superfluous copy of this.$scrollElement 2014-06-07 18:09:53 -07:00
Mike Greiling 632313d631 no need to check for href attribute on the scrollable element 2014-06-07 18:09:53 -07:00
Mike Greiling 0be4109688 there is no need for this.offsets and this.targets to be jQuery objects 2014-06-07 18:09:53 -07:00
Chris Rebert 21de05c8c0 don't show tooltips/popovers whose element isn't in the DOM; fixes #13268 2014-06-07 17:54:11 -07:00
Chris Rebert b23ed1b034 put the tooltips into the DOM in the tooltip unit tests 2014-06-07 17:54:11 -07:00
Chris Rebert 20c099d41a add failing test for #13268 2014-06-07 17:54:10 -07:00
XhmikosR 3b99a41246 Merge pull request #13388 from twbs/xhmikosr-js-style 
Improve JS style
 2014-06-07 09:13:05 +03:00
Chris Rebert 3cbbc70d55 Merge pull request #13627 from twbs/maybe-fix-12364 
Hopefully fixes trigger focus restoration on modal close
 2014-06-06 15:59:17 -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
XhmikosR 5ef9383f53 Tweak JSHint and JSCS checks. 
Be more consistent across the whole codebase.

Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
 2014-06-06 01:23:06 +03:00
Chris Rebert 475dbe58b0 Merge pull request #13589 from mrobinet/scrollspy-maxScroll-with-offset 
Adjust for Scrollspy offset when calculating maxScroll.
 2014-05-23 14:36:05 -07:00
Chris Rebert bc1ce426d9 Merge pull request #13593 from ResentedHook/master 
Add tooltip self-reference to address #12320
 2014-05-23 14:33:19 -07:00
Chris Rebert ef62254917 Merge pull request #13557 from bassettsj/aria-describedby-tooltip-13480 
Aria describedby tooltip: #13480
 2014-05-23 14:11:15 -07:00
Max Kramer ee12ce8305 Add aria-haspopup and aria-expanded attributes to dropdown plugin 
1. Add aria-haspopup="true" and aria-expanded="false" to dropdown docs
2. Toggle aria-expanded between "true" and "false" when opening and closing dropdown

Satisfy item 1 from https://github.com/paypal/bootstrap-accessibility-plugin#dropdown. See #13553.
 2014-05-22 18:13:41 -04:00
Chris Rebert b058c018eb Hopefully a fix for #12364 
* register the callback before invoking the toggling
* listen for `hidden` instead of `hide`
* account for the possibility of the associated `show` event being preventDefault-ed

Adds relevant unit tests.
 2014-05-19 02:14:14 -07:00
Chris Rebert e9b99d475c fix typo in assertion description 2014-05-19 00:47:06 -07:00
Chris Rebert 3d1723d689 add missing event namespacing in modal.js 2014-05-16 17:05:03 -07:00
Attila Dobi f47ad79538 add `target` option to Affix plugin 2014-05-16 13:07:45 -07:00
Steven Bassett a70da16f6f Adds aria described by to tooltip plugin for accessibility 
Generates a unique id for tooltip and adds [aria-describedby] to the element
it is called on. Resolves issue #13480

- set up test
- linted the code styles
- passed the tests
- integrated feedback from @cvrebert
 2014-05-16 10:45:38 -07:00
j.corns 122c05dbd8 Add tooltip self-reference to address #12320 
primarily adds a data- attribute to the tooltip (and thus, the popover)
to create a self-reference.
 2014-05-14 10:36:32 -07:00
Mike Robinet c2e94eba8d Add Scrollspy maxScroll with offset test. 2014-05-13 12:53:54 -05:00
Mike Robinet e84b0c0433 Adjust for Scrollspy offset when calculating maxScroll. 2014-05-13 09:57:04 -05:00
XhmikosR 7a765d1f8b Update jQuery to v1.11.1. 2014-05-13 08:33:23 +03:00
fat f219fee07b versions 2014-05-12 21:15:16 -07:00
Jacob c312d735d9 Merge pull request #13191 from AshleyDawson/master 
Fixed nested tab elements li activation
 2014-05-12 20:57:21 -07:00
fat 9900771aa7 fixes #12211: Scrollspy: Navs in different tabs can interfere with each othe 2014-05-12 19:15:23 -07:00
Gregory Pakosz 78cac11cef Fixed affix-bottom positioning 
Set top position to (scrollHeight - this.$element.height() - offsetBottom).
 2014-05-09 00:26:31 +02:00
Chris Rebert 9444df2476 Merge pull request #13511 from hnrch02/button-reset-falsey-values-fix 
Allow for resetText of a button to be a falsey value; fixes #13466
 2014-05-05 22:55:05 -07:00
Chris Rebert a032c396ee Merge pull request #13406 from EnsignR/closed.bs.alert-after-remove 
fires closed.bs.alert *after* DOM detach() as per #12379
 2014-05-05 22:47:50 -07:00
Heinrich Fenkart d8ee1ba9b6 Allow for resetText of a button to be a falsey value; fixes #13466 2014-05-05 19:07:47 +02:00
Chris Rebert 06af640e82 import rules from Ratchet's JSCS config with which we already comply 2014-05-04 15:15:02 -07:00
breaddevil 7627b24c1e replace js scrollspy test for default behavior 2014-05-04 11:24:31 +02:00
Chris Rebert d9edf28c5f make new Carousel tests compatible with noConflict mode 2014-05-01 13:37:44 -07:00
Chris Rebert b23ca2de41 add role="tooltip" to popovers; fixes #13481 2014-05-01 13:27:00 -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
Ross Nye 73f7acc01b Update alert.js 
Added call to remove() after event fires to clean up data as per discussion at #12379
 2014-04-30 13:12:31 +10:00
Chris Rebert 05d4932cad Merge pull request #13396 from twbs/carousel-events 
Carousel event properties
 2014-04-25 19:35:38 -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
Ross Nye 637808f2ee fires closed.bs.alert *after* DOM detach() 
fires closed.bs.alert *after* element is removed from DOM.
Previously it fired while the element was still attached.
 2014-04-23 17:34:32 +10: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
Chris Rebert f66a747615 add unit tests for Carousel slid events 2014-04-21 13:14:53 -07:00
Chris Rebert 9c4afc5772 spelling fixes in Carousel unit tests 2014-04-21 13:08:42 -07:00
Chris Rebert d971ddb730 add missing operators to some JSCS rules that we already comply with 2014-04-20 16:33:23 -07:00
Tobias Lindig a69bc3bc09 move call for removeBackdrop() to backdrop() 
Closes #11958 by rebasing & merging it
 2014-04-20 14:47:32 -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
Jacob 4f427cbe32 Merge pull request #13354 from twbs/fat-13296 
fixes #13296 Dropdown disappears with right-click on Firefox
 2014-04-20 12:11:25 -07:00
Chris Rebert 170ba560c2 quote attribute value in ^= selector in button.js 2014-04-19 18:53:23 -07:00
Chris Rebert a54e6d4ea9 rename jquery.js -> jquery.min.js since it's minified 2014-04-19 18:25:40 -07:00
Chris Rebert 0aaf2cdd3a quote attribute values in selectors in JS unit tests for consistency 2014-04-19 17:45:58 -07:00
fat f2af95353e fixes #13296 Dropdown disappears with right-click on Firefox 2014-04-15 21:52:34 -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 45b476bdbf JS: remove unused variables. 2014-04-09 10:01:48 +03:00
Collin Donahue-Oponski d7a3771abd When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs.dropdown' 
Closes #11281 by merging it (after rebasing & resolving conflicts)
 2014-04-08 22:36:21 -07:00
Chris Rebert 5ef634dab9 replace $.bind() with $.on() in unit tests; per #13272 2014-04-03 18:13:16 -07:00
XhmikosR 2b30b48894 Fix the new JSHint warnings. 2014-04-03 10:53:13 +03: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
Tyler Cipriani 0907244256 Modal body shift fix for IE10/11 
Closes #13103 by merging it.
 2014-03-28 23:45:22 -07:00
Ashley Dawson 138af82e29 Fixed nested tab elements li activation 
Added closest li instead of direct parent so that you can nest multiple elements within tabs, such as button groups
 2014-03-26 22:21:54 +00:00
Jacob b3421cf040 Merge pull request #13165 from stefanneculai/master 
Fix popover when using append
 2014-03-24 22:42:40 -04:00
Mark Otto 39fec66fc4 Merge branch 'master' into fat-9461 2014-03-24 19:30:17 -07:00
fat 4a2d337bf5 fixes #9461 - Make carousel ignore non-items in carousel-inner 2014-03-24 19:23:39 -07:00
Stefan Neculai 674b41dd63 Add test for popover. 2014-03-24 19:49:06 +02:00
Stefan Neculai 41628c90a2 Fix popover when using append. 2014-03-24 18:49:03 +02:00
XhmikosR d74aee4093 tests/index.html: re-indent. 2014-03-24 09:30:44 +02:00
XhmikosR cfb7093dc0 tests/index.html: add missing `meta charset`. 2014-03-24 09:28:57 +02:00
XhmikosR 58ea8a5601 Update QUnit to v1.14.0. 2014-03-24 09:28:57 +02:00
Ben Ogle 8534e12523 Add tooltip `viewport` option, respect bounds of the viewport 2014-03-21 11:28:13 -07:00
Chris Rebert 7cf7e42c67 Merge branch 'hnrch02-modal-toggle' 2014-03-16 20:24:59 -07:00
Heinrich Fenkart 4e4e456341 Fix #12845 - Modal#hide should only be called with an event argument 
Closes #12850
 2014-03-16 20:24:33 -07:00
Jacob fa4379de08 Merge pull request #12862 from sultano/patch-1 
Fixed flickering and simplified calculations
 2014-03-16 20:24:21 -07:00
Zlatan Vasović ead17b7ca6 Fix #12375: stop using document.body.scrollTop as it's deprecated in the strict mode 
Closes #12377
 2014-03-16 20:10:52 -07:00
Tobias Lindig 0f366e0376 correct event naming of `scroll` and `load' event 
closes #12337
 2014-03-16 19:58:12 -07:00
fat 615dcb5ca0 fixes #9855 2014-03-16 18:38:47 -07:00
Julian Thilo 6d882a6420 Fix JSHint errors 
X-Ref: 8c9739d477
 2014-03-14 18:16:36 +01:00
Chris Rebert b50d4a176f Merge pull request #13060 from twbs/role-tooltip 
add role="tooltip" to tooltips by default to improve accessibility
 2014-03-13 21:50:01 -07:00
Jacob 905c78129f Merge pull request #11937 from IHomer/master 
Fix: IE10 or lower incorrectly determines the scrollheight of the body. ...
 2014-03-13 21:45:04 -07:00
Jacob 8c9739d477 Merge pull request #11453 from moodyroto/patch-1 
fix scrollspy for targets within tabs
 2014-03-13 21:44:05 -07:00
Chris Rebert 8a6cdff825 add role="tooltip" to tooltips by default to improve accessibility 
See https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#tooltip
 2014-03-13 15:05:13 -07:00
Chris Rebert 6dd51fab44 fix #12771 2014-03-10 00:06:38 -07:00
XhmikosR 9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
fat 4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
fat e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Chris Rebert 297303a7cc use quotes around all element attr vals in JS; fixes #12946 2014-03-06 11:12:17 -08:00
XhmikosR 2545073024 Move `trailing` check to JSCS. 2014-02-28 17:30:08 +02:00
XhmikosR be8f125ce6 Move `camelcase` check to JSCS. 2014-02-28 17:30:08 +02:00
XhmikosR 2619325626 JSCS: Use more style checks. 2014-02-28 17:30:08 +02:00
XhmikosR d65f749390 Move the quotes check to JSCS. 2014-02-28 17:30:08 +02:00
XhmikosR 537e10033e Switch to using JSCS for the indentation check. 2014-02-28 17:30:08 +02:00
Suleman Chikhalia f7c360d620 Fixed flickering and simplified calculations 
- Removed offending line causing a flicker to the default top state
- Simplified calculation of the top offset when in the bottom state
 2014-02-27 00:39:46 -08:00
XhmikosR 63031a3ca5 Bump grunt-jscs-checker. 2014-02-26 19:32:43 +02:00
jonahss 7a80b801d7 updated qunit test reporting so sauce labs can report failing tests 2014-02-21 18:54:50 -08:00
Mark Otto 70b875ceb3 Merge pull request #12761 from hnrch02/no-event-aliases 
Remove event aliases from JavaScript
 2014-02-21 15:14:22 -08:00
XhmikosR 25d047ded4 Merge pull request #12058 from ZDroid/uti 
Remove semicolons from JS tests
 2014-02-18 13:21:05 +02:00
Zlatan Vasović a4dac463e0 Improve `js/tests/index.html` 
- Improve comments.
- Remove `transition.js` script load as `transition.js` unit test doesn't exist.
 2014-02-18 10:43:24 +01:00
Zlatan Vasović a06e15dd36 Remove semicolons from JS tests 2014-02-17 20:56:46 +01:00
Chris Rebert 8eeab63e7e Merge pull request #12720 from twbs/reident-test-files 
Reindent test files
 2014-02-16 12:13:04 -08:00
Heinrich Fenkart 8a78bc065f Remove event aliases from JavaScript 
Makes life for people with custom jQuery builds excluding event aliases much easier.
 2014-02-16 21:00:04 +01:00
XhmikosR 5566c935f2 Merge pull request #12513 from ZDroid/jshint 
Remove `curly: false` from `.jshintrc`
 2014-02-16 20:45:00 +02:00
Zlatan Vasović 69cb7be07f Remove `curly: false` from `.jshintrc` 2014-02-16 19:30:02 +01:00
XhmikosR 895b0006b9 Re-indent test files. 2014-02-14 11:02:03 +02:00
Mark Otto 88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
XhmikosR 8939268a33 Update jQuery to v1.11.0. 
Also, use Google's CDN per #11369.
 2014-01-30 20:50:17 +02:00
Mark Otto 1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Tobias Lindig 084f0fb113 add namespace `.bs` also to the event `dismiss.modal` 2014-01-17 12:16:53 -08:00
Tobias Lindig 7fab3c30f2 remove needless space character 2014-01-17 13:34:03 +01:00
Chris Rebert 6af0013ac5 Revert "Add tooltip `viewport` option, respect bounds of the viewport" 
This reverts commit edb221a20c.
Reverting due to broken JS unit tests.

Conflicts:
	docs/javascript.html
 2014-01-16 20:32:59 -08:00
Mark Otto 03f4534307 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport 
Conflicts:
	docs/javascript.html
 2014-01-16 20:01:28 -08:00
fat 4bd6a52562 add missing paren 2014-01-16 14:28:21 -08:00
fat 82ff4e2e40 tooltip subpixel test fixes 2014-01-16 14:25:28 -08:00
fat 3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
fat 2f76821a4d new qunit 2014-01-16 13:33:09 -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 b260d93c58 more detailed QUnit test results in Sauce 2014-01-14 20:21:15 -08:00
Ben Ogle edb221a20c Add tooltip `viewport` option, respect bounds of the viewport 2014-01-14 17:42:29 -08:00
Chris Rebert dde38280f7 upgrade to QUnit v1.0.0 2014-01-13 19:21:07 -08:00
Chris Rebert bfe74f7b2f Revert accidental overzealousness from 16eccc43d9 
Let's not confuse the archaeologists & historians.
 2014-01-13 19:09:51 -08:00
Chris Rebert c9ba678b9f JSCS can be dumb sometimes 2014-01-08 12:37:10 -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
Kevin Sawicki 5141e4da10 Use $ instead of jQuery 2014-01-03 14:39:18 -08: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 2a0b99104c Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles 
Conflicts:
	js/dropdown.js
 2013-12-29 19:23:15 -08: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 76f0d0ff32 fixes #11373 - adds related target to dropdown events 2013-12-29 18:57:22 -08:00
fat 162d9e1776 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top 
Conflicts:
	dist/js/bootstrap.min.js
 2013-12-29 18:04:43 -08:00
fat 9d73d9c38c Merge branch 'master' of github.com:twbs/bootstrap 2013-12-29 17:54:40 -08:00
fat ce4a2e4352 fixes #11288 - Vertical scroll position of modal saves between openings 2013-12-29 17:53:59 -08:00
Jacob ea40e7999d Merge pull request #11203 from jasny/patch-1 
Scrollspy acting up when targets are hidden
 2013-12-28 22:06:26 -08:00
fat 5bf13914e4 fixes #10658 jQuery Popover content loses bound events on second setContent call. 2013-12-28 20:59:45 -08:00
fat c595db19ff fixes #10911 - add loading event for use with remote option :| 2013-12-26 20:26:27 -08:00
fat d21369c1ed fixes #10890 2013-12-26 19:40:18 -08:00
fat 3c73904e17 update tool/pop destroy placement 2013-12-26 18:27:43 -08:00
Jacob 6baf266cda Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy 
don't create new Tooltip/Popover objects just to destroy them immediately
 2013-12-26 18:25:29 -08:00
fat 39091b0748 nope 2013-12-26 18:18:53 -08:00
Jacob bf3c525d05 Merge pull request #11496 from satazor/patch-1 
Clear timeout on destroy.
 2013-12-26 18:18:09 -08:00
fat 34fb5767cb fixes #10798 2013-12-26 17:53:31 -08:00
Jacob 37bfd8fa60 Merge pull request #10801 from Travesty3/master 
Add 'collapse' class back after expanding
 2013-12-26 17:50:41 -08:00
Jacob bea46fca70 Merge pull request #10834 from Prinzhorn/master 
Only preventDefault on click on [data-toggle="modal"] when the element is a link
 2013-12-26 17:46:59 -08:00
Mark Otto d8e4c1578d Merge pull request #12010 from ZDroid/wrong-indent 
Fix wrong indent in .jscs.json
 2013-12-26 12:54:23 -08:00
fat fc7049b18f fixes #10675 2013-12-25 20:33:05 -08:00
fat c25fa0661a Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix 
Conflicts:
	js/tooltip.js
 2013-12-25 20:03:28 -08:00
Zlatan Vasović 1e05029d1a Fix wrong indent in .jscs.json 2013-12-25 20:22:52 +01:00
fat dffd4ffad2 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-24 17:00:55 -08:00
fat 394e0fa611 fixes #11788 - focusin focusout instead of focus/blur 2013-12-24 17:00:34 -08:00
Jacob 0fab6e7ea7 Merge pull request #11722 from DocX/patch-1 
Use document scroll height instead of offset height
 2013-12-24 16:43:24 -08:00
fat c77740bd3a fixes #11720 - Add events trigger to affix 2013-12-24 16:29:51 -08:00
Jacob 139b395dfb Merge pull request #10359 from ixti/patch-1 
Pass $element to offset top/bottom calc funcs
 2013-12-24 13:21:19 -08:00
fat a93a753c7d fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering 2013-12-24 13:07:42 -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
fat 0a75e4c09b fixes #10283 2013-12-24 12:40:24 -08:00
fat 558b6a478d Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
 2013-12-24 12:35:24 -08:00
fat 50bd4edb8c fixes #10236 
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
 2013-12-24 12:32:06 -08:00
Mark Otto 5c2dfbf33b Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	docs-assets/js/raw-files.js
 2013-12-24 12:17:48 -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
fat fe839e6e78 change where modal loads content -– fixes #10105, #9318, #9459 2013-12-23 23:30:06 -08:00
fat 1fc08c1973 fixes #10568 - kill hoverstate info once command has been executed 2013-12-23 22:57:39 -08:00
fat a87b150bc7 fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class 2013-12-23 22:08:43 -08:00
Mark Otto 45a8a9508e Merge pull request #11974 from XhmikosR/meta 
Normalize meta
 2013-12-22 22:20:23 -08:00
XhmikosR a05a11e5dc Get rid of JSHint's `laxcomma` option now that the comma is used on the right side. 2013-12-22 09:02:08 +02:00
XhmikosR 6e3ac8f2a4 js/.jscs.json: sort by name. 2013-12-22 08:59:36 +02:00
Zlatan Vasović 1bf5abab31 No leading pluses 2013-12-19 15:32:37 +01:00
joep.joosten@ihomer.nl 1ceab8b89f Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used. 2013-12-19 12:41:33 +01:00
joep.joosten@ihomer.nl 3bcb1cc255 Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used. 2013-12-19 12:18:51 +01:00
fat 22f9767714 check that href id's are followed by valid char – fixes #10044 2013-12-18 21:14:01 -08:00
Chris Rebert df3716647d update licensing header in JS files & run grunt 2013-12-18 15:29:19 -08:00
Mark Otto b9ca65ebe7 Merge pull request #11416 from danielboendergaard/carousel-duration 
Carousel: Use the transition duration from CSS
 2013-12-18 15:01:47 -08:00
Mark Otto e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Zlatan Vasović ba3639b202 Require comma on left side 2013-12-16 18:06:31 +01:00
Mark Otto 35dd6b9fd7 Merge pull request #10704 from XhmikosR/various 
rm unused vars
 2013-12-14 18:55:25 -08:00
Zlatan Vasović 7f6cf5e50c Add `try` and `catch` to keywords 2013-12-14 21:57:59 +01:00
Scott Plumlee bbe551044c Allow listbox AIRA role on dropdown component. 2013-12-10 14:17:32 -05:00
XhmikosR 5749039f8d Remove unused variables. 2013-12-10 10:11:10 +02:00
XhmikosR eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Chris Rebert c1dae1e13c integrate JSCS 2013-12-06 17:26:07 -08:00
Chris Rebert 351f86e1db fix some JS to pass jscs 2013-12-06 17:23:45 -08:00
XhmikosR 5e2ef69e1c Use a space before functions' bracket consistently. 2013-12-06 12:43:48 +02:00
XhmikosR 4aad52797c Use a space after function consistently. 2013-12-06 12:43:48 +02:00
Lukáš Doležal 6e9efb2024 Use document scroll height instead of offset height to support body with absolute height 2013-12-05 16:28:31 +01:00
mdxs f7d21d6919 Dropping unused variable in dropdown.js 
Dropping an unused variable in the Dropdown function inside the `dropdown.js` code.

There are no new/changed unit tests, as there are no feature/bug changes requiring new test cases.

For the record: I agree to dual-license this contribution under the Apache 2 and MIT licenses.
 2013-12-04 11:15:48 +01:00
Mark Otto 8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto a06610a030 Merge pull request #11502 from 1000hz/patch-1 
Add missing data namespace for dropdown
 2013-11-29 23:55:43 -08:00
Michael Rotoloni 24e3a8b859 Added unit test for removing only active class from within the scroll spy key. 2013-11-18 09:29:10 -05:00
Valera Rozuvan ad86d9a51b Update dropdown.js 2013-11-18 11:55:33 +02:00
Cina S. 56f6847ed6 Add missing data namespace for dropdown 2013-11-16 09:43:47 -06:00
André Cruz 926b940e86 Clear timeout on destroy. 
Clears the internal timeout on destroy so that hanging timers are not fired.
 2013-11-15 23:33:23 +00:00
fat 7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08:00
moodyroto 9f30f55721 Update scrollspy.js 
Scrollspy target in tab content does not work properly. Calling .parents('.active') will return all parents with an active class (including the tab pane). Changing this line to .parentsUntil(this.options.target, '.active') should resolve the issue. This will scope the query to only search for active elements inside the scrollspy target.
 2013-11-11 12:21:34 -05:00
Brian Leonard 5d6e9212a6 Don't deselect radio buttons in data-toggle; fixes #9920 
Merges #10787
 2013-11-10 17:23:11 -08:00
Nathan Muir 934d1bcae5 Add unit test for #9920 
Merges #10385
 2013-11-10 17:23:11 -08:00
Daniel Bøndergaard 268f20e84c Carousel: Use the transition duration from CSS 
This makes it possible to change the transition duration in CSS
 2013-11-08 11:55:06 +01:00
Chris Ziogas ed5dbf1b2b Update affix properly on scrollspy speedy scroll to top of page #11310 
Fix scrollspy.js so as affix is updated properly when user scrolls fast
to top of page.

A fix for issue #11310.
 2013-11-07 16:39:57 +02: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
Chris Rebert 7b24f3c47c QUnit.equals() is deprecated; use QUnit.equal() instead 2013-10-25 14:14:30 -07:00
Zlatan Vasović 63433fbef9 Update license year 2013-10-22 18:41:33 +02:00
Arnold Daniels 5a38a5775f Scrollspy acting up when targets are hidden 
If elements are hidden using `display: none;` which are targets mapped by scrollspy, the plugin might select an incorrect or no menu item.

Checking if the target is visible solved this.
 2013-10-22 13:31:23 +02:00
Chris Rebert f11aa31023 Merge pull request #10519 from zba/master 
changed attr('data-target') to data('target');
 2013-10-14 19:14:58 -07:00
Zlatan Vasović 62c905f5bc Remove [type] 
type="text/css" isn't needed
 2013-10-09 09:45:05 +02:00
Alexander Prinzhorn 12a3bb31f8 Only preventDefault on click on [data-toggle="modal"] when the element is a link 
In it's current state Bootstrap always prevents the default action for a click
event on `[data-toggle="modal"]` elements
(see https://github.com/twbs/bootstrap/blob/master/js/modal.js#L233).
Instead this should only happen when the element is a link.
 2013-09-27 11:32:06 +02:00
Travesty3 1c1850f63e Add 'collapse' class back after expanding 2013-09-25 08:59:01 -04:00
Jochen Berger f350d1ba3d don't create new Tooltip/Popover objects just to destroy them immediately 2013-09-23 15:14:37 +02:00
XhmikosR 3c0489102e Sort by name. 2013-09-18 20:36:17 +03:00
Alexey 7ee2b6a976 changed attr('data-target') to data('target'); 
this will extend js interface, to be possible to setup targets for tabs as 
    var content=$('<div class="tab-pane">',{text: 'content'});
    var tab=('<li>',{html: $('<a>',{text: 'Main options'})}).addClass('active').data({target: $main,toggle: 'tab'}).appendTo(tabs);
 2013-09-08 04:49:27 +03:00
Aleksey V. Zapparov 626cef9fa4 Pass $element to offset top/bottom calc funcs 
At the moment to make dynamic top offset calculator on multiple elements, one would write:

``` javascript
$('.my-affix').each(function () {
  var $el = $(this);
  $el.affix({
    offset: {
      top: function () { return $el.offset().top; }
    }
  });
})
```

This patch will allow to:

``` javascript
$('.my-affix').affix({
  offset: {
    top: function ($el) { return $el.offset().top; }
  }
});
```
 2013-09-02 03:24:27 +02:00
Roland Warmerdam ed1bd2b150 carousel: correctly reset when the slide event is prevented 2013-08-31 18:03:09 +12:00
Martin Hansen 6d3ad5ed7f deleted files not used anymore after transition to grunt-contrib-qunit 2013-08-30 21:39:48 +02:00
Lukasz Fiszer 0adb4e35f0 Fix hidden.bs.tooltip and shown.bs.tooltip events firing too early in tooltip.js 
* events fire only after the CSS animation is completed
* this fixes also events in popover.js (as it inherits from tooltip.js)
 2013-08-26 20:57:47 +02: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
fat 734b6acf13 add small fix for tooltip consistency + fix customizer syntax issue 2013-08-17 20:28:58 -07:00
fat 4696565044 fixes #9745 2013-08-17 16:18:26 -07:00
fat 63ac9e354f fixes #9674 2013-08-17 16:13:48 -07:00
fat c0eabdda9f fixes #9543 2013-08-17 16:11:05 -07:00
fat d754e6564d add some crap 2013-08-17 15:54:42 -07:00
fat 1d53dd31f5 add role=menu to html 2013-08-17 15:48:29 -07:00
fat a10ec62f63 fixes #9579 2013-08-17 15:05:59 -07:00
fat 712b89ed4e fixes #9362 2013-08-17 14:24:38 -07:00
fat 5e89f71ab2 fix for #8768 2013-08-17 13:14:19 -07: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
Jacob Thornton 92c2ad98e7 fixes #8983 2013-08-11 15:41:06 -07:00
Jacob Thornton 89b3cb0dac fixes #9318 2013-08-11 15:17:04 -07:00
Jacob Thornton bf2ab457ea fix comment in tooltip 2013-08-11 14:59:39 -07:00
Jacob Thornton 6393a78bf0 fixes #9279 2013-08-11 14:32:32 -07:00
Jacob Thornton 1abb7947c2 fixes #9222 2013-08-10 14:09:05 -07:00
Jacob Thornton a4f0e8d37a fixes #9111 2013-08-10 13:35:20 -07:00
Jacob Thornton dbed9da774 fixes #6159 2013-08-09 00:16:47 -07:00
Chris Rebert f86f6ee955 fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack 
fixes typo introduced in 2b6ec38987
 2013-08-08 13:31:22 -07:00
Jacob d22bd3a660 Merge pull request #9089 from jdiamond/3.0.0-wip 
accordion's data-parent can't contain dots
 2013-08-07 23:37:05 -07:00
Braden Whitten f816a18f79 Fix spacing after '=' 
Just added a space after a function definition to tidy up the code.
 2013-08-06 17:02:57 -04:00
Mark Otto f266595092 Fixes #9150: Hide popover titles in IE8 
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
 2013-08-06 11:18:12 -07:00
Jason Diamond fb57eda268 use quotes to allow dots in data-parent 2013-08-04 23:59:57 -07:00
Jason Diamond 700e742a9c failing test for dot in data-parent 2013-08-04 23:59:30 -07:00
Chris Rebert 180034a4b4 tooltip.js: add missing space 2013-08-04 17:36:08 -07:00
fat 2b6ec38987 fixes #8880 2013-08-04 17:22:49 -07:00
fat f6cec812a6 fixes #8957 2013-08-02 15:13:12 -07:00
Jacob Thornton 7a3c61ee33 fixes #8892 2013-07-31 22:57:00 -07:00
Jacob Thornton ccd4c9d7b5 fixes #8864 2013-07-31 22:28:05 -07:00
Cesidio Di Landa 3696530aaf Removed trailing whitespaces 
Changed hard tabs to soft tabs
 2013-07-31 18:11:11 +02:00
fat c54b8adb85 fixes #8814 2013-07-30 13:33:56 -07:00
fat 5ee2a221ca fixes #8816 2013-07-30 13:31:57 -07:00
liuyl 270316f140 fix transition end 2013-07-29 20:23:01 +08:00
Jacob Thornton a31c5cea42 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-28 22:16:17 -07:00
Jacob Thornton e5a7af36d5 fixes #8703 2013-07-28 22:14:43 -07:00
Chris Rebert 9c672c6b20 get jshint close to passing by updating .jshintrc settings 
I don't agree with these personally, but they jive with BS/@fat's JS code style.
The remaining jshint complaints are things that really actually should get fixed.
 2013-07-27 21:56:44 -07:00
fat cfa4ab90f3 fix scrollspy for window *and* children 2013-07-26 22:24:51 -07:00
fat 38044e55ae rebuild + fix #2539 2013-07-26 20:44:35 -07:00
fat e2d4cf5f68 change how collapse works - collapse, collapsing, and in 2013-07-26 20:34:39 -07:00
John-Philip Johansson 0d33455ef4 Replace Makefile with GruntJS 
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
 2013-07-26 00:39:14 -07:00
fat f5f04ae4a0 fix affix… 2013-07-25 23:30:13 -07:00
fat 0190128ebc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 21:34:02 -07:00
fat 15d9c82fc5 fix collapse event #8596 2013-07-25 21:33:26 -07:00
Jacob f1ddf7681c Merge pull request #8419 from hollensteiner/3.0.0-wip 
Replace position() with offset() in scrollspy.js
 2013-07-25 21:19:57 -07:00
Chris Rebert 90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Jacob Thornton e9c83647af fixes #8568 -- account for margins in offset 2013-07-24 20:57:26 -07:00
Jacob Thornton aad910465c fixes #8569 2013-07-24 20:21:23 -07:00
Jacob Thornton eaefed517a fixes #8399 w/ tests 2013-07-24 20:10:16 -07:00
Jacob Thornton 217eb988b8 add placement auto for tooltips + tests… kinda sad about this doe 2013-07-23 23:50:23 -07:00
Jacob Thornton 6841c50968 fixes #7814 2013-07-23 22:59:09 -07:00
Jacob Thornton 72d2661ff0 fixes #8232 2013-07-23 20:53:12 -07:00
Jacob Thornton faa00629c4 add additional carousel test 2013-07-23 18:56:00 -07:00
Jacob Thornton 68e87183a0 fixes #8134 2013-07-23 18:54:00 -07:00
Jacob Thornton f1009c19b3 revert collapse change + add emulateTransitionEvent to catch dead css transitions 2013-07-23 18:44:08 -07:00
Jacob Thornton 43e5e90a6d shown.bs.modal fix 2013-07-23 17:32:20 -07:00
Jacob Thornton 7b12a0dcbc fixes #7970 2013-07-23 17:23:02 -07:00
fat 4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
fat 37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
fat b13eecaeec fixes #7880 2013-07-17 23:52:29 -07:00
fat 59f847e8ee fixes #7777 2013-07-17 23:30:05 -07:00
fat 8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
fat 451acb42db fixes #7755 2013-07-17 23:15:50 -07:00
fat 57768d7ea9 fix #7660 2013-07-17 23:01:33 -07:00
fat 18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat 2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat a7a9a14379 fix @muan's unit test ;) 2013-07-17 21:17:39 -07:00
fat 102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 21:14:02 -07:00
fat eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
fat 392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
fat 13cad5061d maybe fix this old ass issue #5973 2013-07-17 19:28:43 -07:00