Arnold Daniels
176ab8f778
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip
...
Conflicts:
Makefile
README.md
docs/assets/css/docs.css
docs/assets/js/bootstrap.min.js
docs/base-css.html
docs/build/index.js
docs/components.html
docs/customize.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/index.mustache
js/bootstrap-typeahead.js
package.json
2012-11-29 23:58:46 +01:00
Ingmar Steen (Voipro)
6b7027eaec
Check if target is dismiss or trigged in fileupload data-api click handler.
2012-11-16 10:34:55 +01:00
Arnold Daniels
2c5abe3cbb
Added bootstrap.js in source
2012-11-16 10:34:55 +01: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
Arnold Daniels
34648bb0bd
Added typeahead functionality
...
* AJAX search
* Convert select to typeahead
* Use value objects as search
* Customizable dropdown
* Min-width menu typeahead
* Fixed click typeahead menu (see twitter/bootstrap#2715 ) as suggested by @mckramer
Padding 2px for select
2012-10-28 02:46:52 +02: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
Arnold Daniels
998051173a
Color border for error/warning/success for fileupload. Fixed #10
...
Cancel button clears fileupload widget. Fixed #11
2012-10-12 05:00:38 +02:00
Arnold Daniels
40f0d3c2b3
Cast option.mask to string. Fixed issue #12
2012-10-12 02:14:18 +02:00
Arnold Daniels
ee0c1b4c62
Merge remote-tracking branch 'twitter/master' into 2.1.0-j2-wip
2012-10-09 13:37:41 +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
Jacob Thornton
667179f406
added support for jquery 1.8.*
2012-09-20 16:23:54 -07:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
Arnold Daniels
aa6fc5043c
Fixes for fileupload
...
- Clear file input when pressing input button
- Cancel event when pressing dismiss (before init)
- Don't clear name when no file is selected in IE
New feature: data-trigger="fileupload"
2012-09-05 11:46:18 +02:00
Arnold Daniels
e7c6351285
Fixes for bootstrap fileupload
...
- Fix for IE9-
- Fix for click on dismiss button (befor init)
2012-09-05 11:46:18 +02:00
Arnold Daniels
04c7c677f4
Documented file upload + upload button
...
Added bootstrap-fileupload.js to Makefile
Added jasny/fileupload.less to jasny/bootstrap.less
2012-09-05 11:46:17 +02:00
Arnold Daniels
b304ffc070
Added file upload and image upload widgets
...
Added upload button
2012-09-05 11:46:17 +02:00
Arnold Daniels
c8f966f290
Documented Row link js
...
Added bootstrap-rowlink.js to Makefile
Added jasny/rowlink.less to jasny/bootstrap.less
2012-09-05 11:46:17 +02:00
Arnold Daniels
8f657b2722
Added the row link javascript plugin
2012-09-05 11:46:17 +02:00
Arnold Daniels
4529e0928c
Documented inputmask javascript plugin
...
Added bootstrap-inputmask.js to Makefile
2012-09-05 11:46:17 +02:00
Arnold Daniels
f70a085690
Added inputmask javascript plugin
2012-09-05 11:46:17 +02:00
