Arnold Daniels
695c18090a
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4
...
Fixed variables when loading custom.json
Conflicts:
Makefile
README.md
component.json
composer.json
docs/assets/css/bootstrap-responsive.css
docs/assets/js/application.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/javascript.html
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-typeahead.js
package.json
2013-02-20 02:16:44 +01: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
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
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
Arnold Daniels
fb77462b91
Small fixes inputmask
...
Set default option 'mask'. Fix #54
Allow setting the definitions as option.
2013-01-27 22:59:50 -08:00
Arnold Daniels
db7f905653
Fix jQuery 1.9 removed $.browser for inputmask. Fixes #63
2013-01-27 22:35:56 -08:00
Arnold Daniels
677bf21344
Merge branch 'patch-1' of github.com:ameyab/bootstrap into 2.2.2-j4-wip
2013-01-27 22:32:06 -08:00
Ameya Bhatawdekar
75f545982c
Update js/bootstrap-fileupload.js
...
Support for jquery.browser was removed in 1.9. This caused the "Remove" button to not work.
Changed line 103 from
if($.browser.msie){
to
if (navigator.userAgent.match(/msie/i)){
2013-01-27 17:22:01 -08: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
Arnold Daniels
ce0b235c86
Bind to document instead of 'body'
...
As per twitter#5308
2013-01-15 03:12:14 +01:00
Arnold Daniels
15c80617a5
Merge branch 'patch-1' of github.com:ghiculescu/bootstrap into 2.2.2-j4-wip
2013-01-15 03:08:34 +01:00
Arnold Daniels
f28b38852d
Fileupload fix: Don't need to get file on clear
2013-01-15 03:01:03 +01:00
gboer
a78887117c
Update js/bootstrap-fileupload.js
...
A bit better fix for when the element itself is the dismiss button
2013-01-12 12:03:53 +01: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
Alex Ghiculescu
695b1ccafe
Bind to document instead of 'body'
...
As per https://github.com/twitter/bootstrap/pull/5308
2012-12-31 15:10:41 +10: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
Arnold Daniels
ef7599fd94
Fixed comments in bootstrap-fileupload.js
2012-12-26 10:44:48 +01:00
Arnold Daniels
c63e570f7f
Using in fileupload. Fixed #19
2012-12-25 06:48:51 +01:00
Arnold Daniels
8fa7b7ee99
Reset fileupload on form reset. Fixed #31
...
Allow resetting and clearing fileupload using js
2012-12-25 06:41:17 +01:00
Arnold Daniels
0657ace43c
Fix problem with tr comparison in jasny rowlink. Fixed #34
2012-12-25 05:43:40 +01:00
Arnold Daniels
50636c2345
Fix GET data for js test server
2012-12-25 05:22:28 +01:00
Arnold Daniels
c607fec9b9
Merge branch 'master' of git://github.com/SkynetInc/jasny-bootstrap into 2.2.2-j3-wip
2012-12-25 05:10:10 +01:00
Arnold Daniels
a78e874844
Fixed typeahead issues
...
Added typeahead tests
Added new features of typeahead to docs
2012-12-25 04:46:34 +01: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
