0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Commit Graph

177 Commits

Author SHA1 Message Date
Chris Rebert
e9b99d475c fix typo in assertion description 2014-05-19 00:47:06 -07:00
XhmikosR
7a765d1f8b Update jQuery to v1.11.1. 2014-05-13 08:33:23 +03: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
d9edf28c5f make new Carousel tests compatible with noConflict mode 2014-05-01 13:37:44 -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
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
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
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
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
cd4696f723 fixes #11099 - $.collapse() overrides the original dimension of the coll... 2014-04-15 21:16:40 -07:00
XhmikosR
45b476bdbf JS: remove unused variables. 2014-04-09 10:01:48 +03:00
Chris Rebert
5ef634dab9 replace $.bind() with $.on() in unit tests; per #13272 2014-04-03 18:13:16 -07: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
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
Julian Thilo
6d882a6420 Fix JSHint errors
X-Ref: 8c9739d477
2014-03-14 18:16:36 +01: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
6dd51fab44 fix #12771 2014-03-10 00:06:38 -07:00
XhmikosR
9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
XhmikosR
537e10033e Switch to using JSCS for the indentation check. 2014-02-28 17:30:08 +02:00
jonahss
7a80b801d7 updated qunit test reporting so sauce labs can report failing tests 2014-02-21 18:54:50 -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
XhmikosR
895b0006b9 Re-indent test files. 2014-02-14 11:02:03 +02:00
XhmikosR
8939268a33 Update jQuery to v1.11.0.
Also, use Google's CDN per #11369.
2014-01-30 20:50:17 +02: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
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
fat
c77740bd3a fixes #11720 - Add events trigger to affix 2013-12-24 16:29:51 -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
Zlatan Vasović
1bf5abab31 No leading pluses 2013-12-19 15:32:37 +01:00
Zlatan Vasović
ba3639b202 Require comma on left side 2013-12-16 18:06:31 +01:00
XhmikosR
eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02: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