rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
8,975 Commits 108 Branches 89 Tags 553 MiB
de86b36b50
Commit Graph

640 Commits

Author SHA1 Message Date
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