rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
10,227 Commits 108 Branches 89 Tags 552 MiB
1917b2d870
Commit Graph

811 Commits

Author SHA1 Message Date
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
ClausH
0a72530429 Replace position with offset 2013-07-08 12:02:31 +02:00
Mu-An Chiou
55fa1acbd6 Tooltip: apply position class before positioning 2013-06-28 11:05:38 +01:00
Jacob
d23800c828 Merge pull request #7424 from sody/3.0.0-wip 
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class.
 2013-06-27 22:36:33 -07:00
fat
b0da97588e fixes #6982 2013-06-27 19:19:22 -07:00
Mark Otto
2aec6dae59 Fixes #7730: Better hiding of empty titles in popovers 
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3
 2013-06-20 16:02:05 -07:00
Ivan Khalopik
e138b0df3a Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip 2013-06-10 10:31:51 +03:00
Robert Burns
cc684750e5 Fix for carousel indicators 2013-06-01 08:15:40 -04:00
fat
f5ce66177b fix event binding in modal.js 2013-05-29 11:24:00 -04:00
fat
9257bdc097 fixes #7163 2013-05-27 12:45:13 -07:00
Ivan Khalopik
3285f4c306 Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip 
Conflicts:
	js/bootstrap-collapse.js
 2013-05-27 11:06:31 +03:00
Jacob Thornton
7cbb1c0452 add data-ride=carousel support for starting carousel on load 2013-05-25 00:16:52 -07:00
Jacob Thornton
e424b3879c fixes #4781 2013-05-24 23:53:44 -07:00
Jacob Thornton
f3e45c3778 add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things 2013-05-24 23:15:04 -07:00
Mark Otto
432d417ade fixes #6898: typo in modal test 2013-05-22 23:17:39 -07:00
fat
e7b4fedee8 remove 3rd arg from $.each call 2013-05-22 15:18:30 -07:00
Jacob Thornton
ccfa989898 upgrade jshint to 2.1.2 for anton <3 2013-05-21 19:31:51 -07:00
fat
140ef2320b change namespace back to dot notation and someother js shizzle 2013-05-16 20:19:51 -07:00
fat
5ab72f7687 fix tooltip defaults 2013-05-16 18:45:53 -07:00
fat
b239542a5e carousel bug with data 2013-05-16 18:21:42 -07:00
fat
f37b351288 only overlay dropdowns for mobile 2013-05-16 18:15:34 -07:00
fat
a72d0d6e3a fix tests 2013-05-16 17:44:50 -07:00
fat
19de2e8603 add bs- prefix to tooltip 2013-05-16 17:19:23 -07:00
fat
149ecd21bf straight trash wang 2013-05-16 17:18:15 -07:00
fat
92245e8bc7 change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click 2013-05-16 12:50:06 -07:00
fat
bdbd268cb9 update collapse js style 2013-05-16 11:20:18 -07:00
fat
14651035de a bunch javascript junk 2013-05-16 11:06:30 -07:00
Ivan Khalopik
3c7a43a1f3 Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip 
Conflicts:
	js/tests/unit/bootstrap-collapse.js
 2013-05-07 15:16:45 +03:00
Stephen Edgar
1b132ddcb4 'js' folder .editorconfig code guide updates 2013-04-23 17:34:27 +10:00
Mark Otto
23d7215dbe Modify scrollspy to add .active to all parent li items /cc @fat 2013-03-29 23:32:47 -07:00
Ivan Khalopik
41c7825677 Fixes #7213 Collapse plugin does not correctly set the "collapsed" class on accordion heading links 2013-03-29 19:17:03 +03:00
Mark Otto
a70c50d1f7 Merge branch 'master' into 3.0.0-wip 
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	package.json
 2013-03-01 12:37:21 -08:00
fat
839b0c893f shiiiit 2013-02-28 21:15:33 -08:00
fat
3469339068 2.3.1 2013-02-28 20:55:14 -08:00
fat
01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat
ef80765726 pass true to cycle 2013-02-28 19:47:01 -08:00
fat
40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto
2aa1a4dc70 Merge branch 'master' into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-02-07 22:18:53 -08:00
fat
501aabf572 remove prevent default on focus 2013-02-07 21:42:34 -08:00
fat
366e1e0a6d only fire hidden once backdrop has been removed 2013-02-07 20:13:40 -08:00
fat
1bf070b4ce Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-02-07 19:47:01 -08:00
fat
d8a7a380bc if no callback, don't try to call callback ya goof 2013-02-07 19:45:42 -08:00
Mark Otto
a9729c5fd0 fix js from @fat feedback for modal 2013-02-07 19:38:46 -08:00
Yohn
60c9ff4364 unit tests 2013-02-06 06:20:05 -05:00
Yohn
beb60309d1 dont remove title attribute part 2 2013-02-06 06:17:48 -05:00
Mark Otto
8ca70bd83a Overhaul modal to make it responsive and not super lame 2013-02-06 02:07:40 -08:00
Mark Otto
421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
 2013-02-05 22:42:54 -08:00
fat
3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-02-05 22:30:54 -08:00
fat
4814281540 clean up styles 2013-02-05 22:29:59 -08:00
fat
5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun
6a9cd513c0 Merge pull request #6783 from joprice/popoverOptionsOverride 
reordered access of options in tooltip and popover
 2013-02-05 21:48:34 -08:00
Mark Otto
1629df8008 screwed up a merge and an old version number crept in 2013-02-05 21:20:29 -08:00
fat
a4b31d39a2 don't hide if already hidden ya n00b 2013-02-05 21:08:56 -08:00
fat
a866a51a2e clear interval in cycle + rebuild 2013-02-05 20:34:39 -08:00
fat-kun
566380b257 Merge pull request #6488 from nanek/dropdowns-remove-touchstart 
Remove touchstart from bootstrap-dropdown.js.
 2013-02-05 20:08:42 -08:00
fat
c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat
45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Joseph Price
4b86a91e53 fix typo 2013-02-04 09:10:48 -05:00
Joseph Price
1fe4ed8823 reordered access of options in tooltip and popover to allow overriding data attrs from js 2013-02-02 18:58:56 -05:00
Guillaume Smet
b7764d8a33 Fix tooltip positioning for IE8 
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
 2013-01-29 19:50:13 +01:00
Guillaume Gautreau
ee71fb492f No semicolumns 2013-01-27 10:56:01 +01:00
Guillaume Gautreau
5b0f956a60 Arrow replacement 2013-01-26 21:45:21 +01:00
Guillaume Gautreau
d9a0abaa06 works with fixed test 2013-01-26 21:39:49 +01:00
Guillaume Gautreau
db9ec13ce4 Test for replacing tooltip when resized 2013-01-26 21:39:05 +01:00
Guillaume Gautreau
e5be883bb9 lint + wrong comparison 2013-01-26 14:31:33 +01:00
Guillaume Gautreau
929598784f Unit test for replacing tooltip inside window 2013-01-26 14:06:58 +01:00
Guillaume Gautreau
6803ff70f9 Tooltip positionning on special cases 2013-01-26 13:50:26 +01:00
Mark Otto
7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
 2013-01-13 04:26:52 -08:00
Mark Otto
6e5a2fedaa Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago 2013-01-10 18:51:04 -08:00
Kenan Shifflett
b5ad50686c Removed touchstart from bootstrap-dropdown.js. 2013-01-07 20:13:28 -05:00
Mark Otto
9749d6afc2 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-26 09:21:34 -06:00
fat-kun
b9c7f29134 Merge pull request #6378 from Yohn/patch-7 
fixes tooltip insert problems
 2012-12-24 16:17:25 -08:00
Yohn
9835549faf made container option be false 2012-12-24 18:59:37 -05:00
Yohn
e867ae7b60 removed the length check 
updated it to @fat's suggestion
 2012-12-24 18:07:41 -05:00
Yohn
b6960d8cf9 Update js/tests/unit/bootstrap-tooltip.js 2012-12-23 04:21:02 -05:00
Yohn
d594d6377a adding container option to tooltips 2012-12-23 04:18:16 -05:00
KAWACHI Takashi
defe85bb51 Assign event variables at declarations 2012-12-23 15:17:41 +09:00
KAWACHI Takashi
7a3a88acc6 Tooltips fires show, shown, hide, hidden events 
It is re-worked from #3691.
 2012-12-23 14:42:13 +09:00
Mark Otto
f74990d898 Version bump 2012-12-22 16:10:06 -08:00
fat-kun
d09b46fe37 Merge pull request #6349 from Yohn/patch-6 
Fixes #5753 with tooltip('toogle')
 2012-12-22 14:53:24 -08:00
fat
effba9e55c add data-api namespace to dropdown 2012-12-22 14:22:45 -08:00
fat
2c0ed072b0 shifting focus to parent and adding aria menuitem for dropdown 2012-12-22 13:57:57 -08:00
fat
a9e661a2b5 read data options in constructor for collapse 2012-12-22 13:48:16 -08:00
fat
fad0fb683b allow multiple trigger types in tooltip and popover + default tooltip to hover & focus 2012-12-22 13:24:37 -08:00
fat
e2434fefbd chnage for #6248 2012-12-21 20:27:53 -08:00
fat
24a36df9f6 add support for [data-slide-to] attr on carousel 2012-12-21 19:45:19 -08:00
fat
82a758344d add direction prop to carousel slide event 2012-12-21 17:31:54 -08:00
fat
5da30ee5fb Merge branch 'marcelkorpel-master' into 2.3.0-wip 2012-12-21 17:24:45 -08:00
fat
d5345f806c Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master 2012-12-21 17:19:36 -08:00
Mark Otto
a5e04c0799 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
 2012-12-20 13:47:36 -08:00
Yohn
a6705246d0 Update js/tests/unit/bootstrap-tooltip.js 2012-12-20 04:36:57 -05:00
Yohn
e21b6459ad fixes tooltip('toggle') 2012-12-20 04:34:28 -05:00
fat
5abe33f5d8 reset carousel in the case that it is reinstantiated twice 2012-12-20 01:13:03 -08:00
fat
2c9f43f685 if carousel element already open, don't reopen it duh bruh bruh 2012-12-20 01:05:07 -08:00
Mark Otto
72f13e2870 Merge branch '2.2.3' into 3.0.0-wip 
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	less/type.less
	package.json
 2012-12-20 00:02:52 -08:00
fat
7f9ff0ba5b add js support for carousel indicators 2012-12-19 23:25:25 -08:00
fat
96e5fa6143 whitespace in tooltip + don't pass empty selector to $() in dropdown.js 2012-12-19 22:26:36 -08:00
fat
219d275ae6 can't extend bounding box thingy 2012-12-19 22:03:57 -08:00
fat
dc4e80a655 fix ghetto ass timeout shit 2012-12-19 21:55:23 -08:00
fat
5bd8cdca91 remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install 2012-12-19 21:36:50 -08:00
Mark Otto
529ecc5a77 Version bump 2012-12-10 18:31:04 -08:00
Mark Otto
bc0b94a3fd Merge branch 'master' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
 2012-12-08 17:40:42 -08:00
fat
820a3b27b6 get tests passing for typeahead :P 2012-12-07 19:16:48 -05:00
fat
1747caf19d insert menu of typeahead after input which it suggests on #3529 
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
 2012-12-07 18:59:13 -05:00
fat
437654030a focus on escape in typeahead 2012-12-07 18:37:32 -05:00
fat
10e72e158d Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 17:50:34 -05:00
fat
91fbadad5b remove slide from carousel constructor #5579 2012-12-07 17:49:05 -05:00
billy gates
c362e72660 Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav 
Fix issue with double move event firing in typeahead.
 2012-12-07 14:16:51 -08:00
fat
66b70016d0 rebuild and only select visible dropdown items 2012-12-07 17:14:49 -05:00
billy gates
2526c3fdbe Merge pull request #6118 from godric7/master 
scrollSpy - add parent scrollTop to offset calculation
 2012-12-07 14:11:18 -08:00
fat
a7eb9c294a add noConflict functionality to all bootstrap plugins 2012-12-07 17:06:01 -05:00
Mark Otto
33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip 
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
 2012-12-05 11:05:10 -08:00
Mark Otto
ed74992853 Fixes #4550: Temporary fix for dropdown taps on mobile 
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
 2012-12-04 18:36:18 -08:00
Godric
8b959cacbc Update js/bootstrap-scrollspy.js 
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
 2012-12-04 01:21:07 +01:00
Marcel Korpel
0dece7a71f Set focus back to input field after clicking an item 
Test 'focus is still set' added

Fixes issue #5933
 2012-12-02 12:35:33 +01:00
Mark Otto
85c57c6ba8 Merge branch 'Moveo-master' into 2.2.2-wip 2012-12-02 01:32:13 -08:00
Mark Otto
98b0d475ae version bump to 3.0 2012-11-30 22:30:50 -08:00
Swaagie
e6e4d93d5e leave it to the developer to decide how to use the content of the popover 2012-11-27 15:07:31 +01:00
Paul McLanahan
6ec7c72e5b Fix issue with double move event firing in typeahead. 
Fix test to catch issue.
Fix #5806.
 2012-11-13 11:00:34 -05:00
Mark Otto
79b7017227 version bump 2012-11-05 09:32:48 -08:00
fat
3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
fat
404e4d9e9a fix carousel and rebuild js 2012-10-30 21:32:15 -07:00
Mark Otto
b5af762ef5 Merge branch '2.1.2-wip' 
Conflicts:
	js/bootstrap-dropdown.js
 2012-10-29 22:01:58 -07:00
Mark Otto
41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Jacob Thornton
ba2a99e7c4 don't lookup typeahead when shift alt or ctrl are pushed 2012-10-17 23:39:41 -07:00
Jacob Thornton
45046544a6 when static, refocus on click 2012-10-17 23:36:22 -07:00
Jacob Thornton
0b9d4e78ad Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 23:06:58 -07:00
Jacob Thornton
7f3b94c453 Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document 
Conflicts:
	js/bootstrap-carousel.js
 2012-10-17 23:05:16 -07:00
billy gates
d6ac499ca8 Merge pull request #5309 from erlendfh/dropdown-bugfix 
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
 2012-10-17 23:00:41 -07:00
billy gates
24b5e6cb14 Merge pull request #5366 from Sinetheta/2.1.2-wip 
Fix for #5362
 2012-10-17 22:30:40 -07:00
Jacob Thornton
a2fc01444e Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 22:27:00 -07:00
Jacob Thornton
edc3eee5ea fix carousel event 2012-10-17 22:26:44 -07:00
billy gates
21f29a7682 Merge pull request #5389 from frntz/2.1.2-wip 
Update js/bootstrap-tooltip.js
 2012-10-17 22:15:48 -07:00
billy gates
0a3e034891 Merge pull request #5524 from martinstein/fix-tooltip-delegate-click 
Fix tooltip not working in delegate events on click-trigger
 2012-10-17 21:34:01 -07:00
billy gates
97bf02d787 Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix 
Fixed copy/paste caused typo
 2012-10-17 21:25:21 -07:00
mfansler
e24b46b7f3 fixes #5336: reorder focus() call to avoid scrolling 2012-10-16 12:27:43 -04:00
Dmitriy Budnik
ae0ba0686e set spesific assertions count for test 2012-10-16 11:16:38 +03:00
Dmitriy Budnik
cd55963930 fixed test 2012-10-16 09:49:26 +03:00
dmitriybudnik
432eaff29c Fixed copy/paste caused typo 2012-10-15 22:35:32 +03:00
Martin Stein
6b017b9bea fixed reference to this.tip() so it works in delegate events 2012-10-15 15:17:59 +02:00
Kevin Attfield
48a8dd2a23 Added test to fix for #5362 2012-10-08 22:29:44 -07:00
frntz
b892a37320 Update js/bootstrap-tooltip.js 
Avoid loosing events attached on Jquery object if added via function in popover content
 2012-10-02 18:26:55 +03:00
Kevin Attfield
82715ae96d Fix for #5362 
Fix for issue [5362](https://github.com/twitter/bootstrap/issues/5362):
tab events fired on wrong dropdown anchor.
 2012-09-30 21:41:37 -07:00
Carl Porth
e1f6458e36 don't wait for ready when binding events to document 2012-09-27 15:00:02 -07:00
Artem Kustikov
0944e036ae Fix for #4550 
Also fixes dropdowns hiding behavior for case when two or more dropdowns
with [data-toggle=dropdown] exist on the page
 2012-09-27 21:45:37 +03:00
Erlend Halvorsen
e9a648cd39 Fixed bug in dropdown toggle where menu would only clear on the first drop down 2012-09-27 10:31:40 +02:00
Carl Porth
474471b831 bind data-api events to document instead of body to allow body replacement 2012-09-26 23:11:03 -07:00
Jacob Thornton
0540b63ab0 check affix pos on clicks - use timeout for clicks which scroll 2012-09-24 23:59:02 -07:00
Jacob Thornton
88b1e44dd6 change tooltip/popover insert strategy 
remove modal-open class
hopefully resolve z-index headaches
 2012-09-24 23:28:38 -07:00
Jacob Thornton
003fcccceb change tooltip/popover html default to false for xss safety net 2012-09-24 23:15:36 -07:00
Jacob Thornton
ebf94c53a5 change transition.js, rebuild… travis maybe will be happy? 2012-09-20 16:50:36 -07:00
Jacob Thornton
1716b0fdb5 remove src's 2012-09-20 16:31:10 -07:00
Jacob Thornton
fe38d12f12 rebuild - fix missing ( 2012-09-20 16:26:00 -07:00