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

267 Commits

Author SHA1 Message Date
fat
b19719ea1a Merge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil/bootstrap into breaddevil-replace-scrollspy-default-behavior-test
Conflicts:
	js/tests/unit/scrollspy.js
2014-07-06 14:11:23 -07:00
Jacob
279c46152b Merge pull request #13815 from hnrch02/tabs-fade-not-active
Allow tabs to fade in if no initially active pane is present
2014-07-06 13:50:54 -07:00
Heinrich Fenkart
58eb8b2ae3 Move to leading pluses 2014-07-06 11:56:12 +02:00
Heinrich Fenkart
dad56be96c Move to 16ms from 18ms based on the Paul Irish's rAF polyfill 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
8ff099585f Mention #13500 in comment for ScrollSpy test 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
e341355d28 Clean tooltip unit tests up 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
b3a125e941 Clean tab unit tests up 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
05ba1e491e Clean scrollspy unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
56b8d5fe6e Clean popover unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
998c3724e8 Clean modal unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
9ff66a12bc Clean dropdown unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
77d0557468 Clean collapse unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
6a523bf99d Clean carousel unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
f3345f68d7 Clean button unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
b063de54a5 Clean alert unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
95d7c9c3fb Clean affix unit tests up 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
4950fe6f4e Perform a cleanup after each test 2014-07-06 09:24:22 +02:00
Heinrich Fenkart
1e64c4c0ba Update QUnit settings/QUnit phantomjs bridge to new versions 2014-07-06 09:24:22 +02:00
Jacob
5830febd9a Merge pull request #13855 from hnrch02/modal-mousedown
Use mousedown instead of click for backdrop click detection; fixes #13816
2014-07-06 00:01:57 -07:00
Michael Silber
1e407c81f1 Add collapsed default class to navbar-toggle 2014-07-02 16:49:03 -04:00
Heinrich Fenkart
91f329e448 Only close modal if escape was hit with keydown; fixes #13929 2014-07-01 05:50:31 +02:00
Heinrich Fenkart
121bf6633e Use mousedown instead of click for backdrop click detection; fixes #13816 2014-07-01 02:53:57 +02:00
Heinrich Fenkart
282f8fc04b Add a few more cases to the visual test tab page 2014-06-25 04:18:51 +02:00
Jacob
fe74a8bb3e Merge pull request #13755 from twbs/fat-visual-test
Adds isolated visual tests for javascript plugins (decoupled from docs)....
2014-06-08 16:05:08 -07:00
fat
91103e6d1f Adds isolated visual tests for javascript plugins (decoupled from docs). This makes it
faster and easier to test/develop js functionality not represented in unit tests, and gives us
a playground for interactions, etc.

It also makes it so developing javascript is now decoupled form jekyll, which should make everything
faster and less painful.

This commit also reverts my filter commit 9900771aa7
which broke scrollspy for dropdowns.
2014-06-07 19:11:44 -07:00
Chris Rebert
b23ed1b034 put the tooltips into the DOM in the tooltip unit tests 2014-06-07 17:54:11 -07:00
Chris Rebert
20c099d41a add failing test for #13268 2014-06-07 17:54:10 -07:00
XhmikosR
3b99a41246 Merge pull request #13388 from twbs/xhmikosr-js-style
Improve JS style
2014-06-07 09:13:05 +03:00
Chris Rebert
3cbbc70d55 Merge pull request #13627 from twbs/maybe-fix-12364
Hopefully fixes trigger focus restoration on modal close
2014-06-06 15:59:17 -07:00
XhmikosR
e2cabe4971 Minor style tweaks. 2014-06-06 01:23:07 +03:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
XhmikosR
5ef9383f53 Tweak JSHint and JSCS checks.
Be more consistent across the whole codebase.

Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
2014-06-06 01:23:06 +03:00
Chris Rebert
475dbe58b0 Merge pull request #13589 from mrobinet/scrollspy-maxScroll-with-offset
Adjust for Scrollspy offset when calculating maxScroll.
2014-05-23 14:36:05 -07:00
Chris Rebert
bc1ce426d9 Merge pull request #13593 from ResentedHook/master
Add tooltip self-reference to address #12320
2014-05-23 14:33:19 -07:00
Chris Rebert
ef62254917 Merge pull request #13557 from bassettsj/aria-describedby-tooltip-13480
Aria describedby tooltip: #13480
2014-05-23 14:11:15 -07:00
Chris Rebert
b058c018eb Hopefully a fix for #12364
* register the callback before invoking the toggling
* listen for `hidden` instead of `hide`
* account for the possibility of the associated `show` event being preventDefault-ed

Adds relevant unit tests.
2014-05-19 02:14:14 -07:00
Chris Rebert
e9b99d475c fix typo in assertion description 2014-05-19 00:47:06 -07:00
Steven Bassett
a70da16f6f Adds aria described by to tooltip plugin for accessibility
Generates a unique id for tooltip and adds [aria-describedby] to the element
it is called on. Resolves issue #13480

- set up test
- linted the code styles
- passed the tests
- integrated feedback from @cvrebert
2014-05-16 10:45:38 -07:00
j.corns
122c05dbd8 Add tooltip self-reference to address #12320
primarily adds a data- attribute to the tooltip (and thus, the popover)
to create a self-reference.
2014-05-14 10:36:32 -07:00
Mike Robinet
c2e94eba8d Add Scrollspy maxScroll with offset test. 2014-05-13 12:53:54 -05: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
breaddevil
7627b24c1e replace js scrollspy test for default behavior 2014-05-04 11:24:31 +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
XhmikosR
4aad52797c Use a space after function consistently. 2013-12-06 12:43:48 +02: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
Nathan Muir
934d1bcae5 Add unit test for #9920
Merges #10385
2013-11-10 17:23:11 -08:00
Chris Rebert
7b24f3c47c QUnit.equals() is deprecated; use QUnit.equal() instead 2013-10-25 14:14:30 -07:00
Zlatan Vasović
62c905f5bc Remove [type]
type="text/css" isn't needed
2013-10-09 09:45:05 +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
fat
63ac9e354f fixes #9674 2013-08-17 16:13:48 -07:00
fat
712b89ed4e fixes #9362 2013-08-17 14:24:38 -07:00
Jacob Thornton
a4f0e8d37a fixes #9111 2013-08-10 13:35:20 -07:00