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

49 Commits

Author SHA1 Message Date
Troy Morehouse
6c70c70f63 fix(scrollspy): Spying on nested navs fails to activate for .nav-link's inside nav-item's (#23967)
* fix(scrollspy): Handle nested navs when nav-link inside nav-item

* [scrolspy] Find only child .nav-link's inside .nav-item

* [scrollspyt] Add tests for nested navs with nav-link inside nav-item

* fix troy-o's in test
2017-09-17 09:30:37 +02:00
XhmikosR
ef8c77d8dc Tweak ESLint rules. 2017-08-23 00:05:38 +03:00
Geremia Taglialatela
db44e4b311 Update nav and navbar HTML markup
According to the docs, you just need to apply the `navbar-nav` to an
`<ul>` tag in a list-based navbar. In fact, `navbar-nav` seems to
override all the css properties set by `nav`.

Also, `nav-item` class should be used only for `<li>` tags, or in
conjunction with `<a>` tags to entirely avoid the list-based approach.

This commit removes the redundant `nav` class from `navbar-nav` `<ul>`
tags, moves `nav-item` from `<a>` tags to `<li>` tags and properly
adds `nav-item` class to `<li>` tags where missing.

Refs:

* https://v4-alpha.getbootstrap.com/components/navs/
* https://v4-alpha.getbootstrap.com/components/navbar/#nav
2017-05-27 15:21:49 -07:00
Pierre Vanduynslager
91b62941af Tabs/Scrollspy/.nav/.list-group/.active independent of markup (<nav>, .nav-item, <li> etc...) 2017-04-02 11:21:04 +02:00
Pierre Vanduynslager
78fc4d23fc Always append element to fixture in Scrollspy unit tests (#22234) 2017-03-21 10:21:00 -07:00
Rob Ruana
5eddb0b0fd Closes #21055: Prevents ScrollSpy from clearing active item when Safari rubberbands (#21056)
When the rubberband effect causes Safari to scroll past the top of the
page, the value of scrollTop becomes negative. If the offset of the first
ScrollSpy target is 0 - essentially if the target is at the top of the
page - then ScrollSpy should not clear the active item. Conceptually, the
first item should remain active when rubberbanding past the top of the
page.

This commit fixes issue #21055 by verifying the first scrollspy target is
not at the top of the page before clearing the active nav-item.
2016-11-27 16:20:33 -08:00
Bardi Harborow
c2616fb74e Make JS compliant with the new ESLint rules. 2016-11-24 11:59:55 +11:00
Dave Methvin
8900d953ed ScrollSpy unit test: Use single done() in a then() instead of multiple done()s (#20198)
Fixes test flakiness on OS X Safari and Android when using jQuery 3.
Fixes #20182 more
Refs #20191
2016-06-28 13:24:28 -07:00
Dave Methvin
208d587c7e Scrollspy test: Allow for async .then() in jQuery 3; fixes #20182
Instead of doing a new assert.async(), just do a single one for the entire test
and let the .then() be async as well.

Closes #20190
2016-06-27 22:37:31 -07:00
Chris Rebert
aa369bd8f9 Remove unnecessary usage of Promises in non-async ScrollSpy tests (#20180)
Closes #19906

[skip validator]
2016-06-26 21:33:07 -07:00
Chris Rebert
14c7ba95f9 Fix load & scroll event usage in ScrollSpy tests (#19986)
* Use $.one() instead of $.on() since there are no $.off()s in the code.
* Remove unnecessary namespacing of listeners for the `scroll` & `load` events.
    These are vanilla DOM events (not custom jQuery namespaced events)
    and we're not using jQuery namespacing to manage these event listeners either (e.g. `$.off()`).

[skip validator]
2016-05-30 09:39:45 -07:00
Chris Rebert
d35973c2b3 js/tests/unit/scrollspy.js: Fix "offsed" typos (#19985)
[skip sauce]
[skip validator]
2016-05-29 18:36:09 -07:00
Johann-S
21a65f181e Add throw error for undefined method on plugins 2015-10-02 10:01:24 +02:00
Jacob Thornton
4e45e2363c Merge branch 'v4' of github.com:twbs/derpstrap into v4 2015-08-18 21:23:53 -07:00
fat
c2ced2292a fix up tests 2015-05-13 13:46:08 -07:00
fat
b0d142334f fix #15301 2015-05-13 13:43:56 -07:00
fat
da495ee24c address https://github.com/twbs/bootstrap/pull/16135 2015-05-13 13:15:11 -07:00
Maxim Andrukhovych
83371735fc Fixed proper navigation element selection on backward scrolling (from the bottom to the top) 2015-03-10 20:04:15 +00:00
Kevin Kirsche
4febcb4b49 [Fixes #15953] Implement assert.expect in each unit test
[Fixes #15953] Implement `assert.expect` in each unit test
2015-03-03 08:45:07 -05:00
Caden Lovelace
a1aa0f8afd Handle multiple zero-offset Scrollspy elements.
When the first two elements in a scrollspy content block have a document
offset of zero (i.e. they're hard against the top of the page),
Scrollspy would switch between them on every scroll event.

This could happen, for example, in a system of nested sections:

```
<section id="animals">
  <section id="dogs">
	Content
  </section>
</section>
```

This ocurred because Scrollspy's check to see if it's at the end of the
array of sections uses `!arr[index]`. This misses the case where
`arr[index]` does exist and is zero.

This commit explicitly checks the array bounds.
2015-03-01 23:55:39 +00:00
Heinrich Fenkart
3bb05b5fbb Unit tests: Use new names of module hooks
Refs #15893
2015-02-26 08:20:42 +01:00
Chris Rebert
118b8c2695 JS unit tests: use QUnit.module() & QUnit.test() everywhere
[skip validator]
2015-02-23 22:14:11 -08:00
Chris Rebert
7c19fee3f1 JS unit tests: use modern QUnit assert object everywhere 2015-02-23 22:14:11 -08:00
Chris Rebert
b56d97f210 update JS unit tests to future-proof QUnit 1.16.0 API
[skip validator]
2015-01-20 19:57:51 -08:00
Heinrich Fenkart
0e991ccba2 Follow-up to e8af21c: rm unused variable in unit test 2014-10-26 03:16:05 +01:00
Tadeu Zagallo
e8af21cc9d Clear scrollspy selection above first section
Closes #13563 by merging it.
2014-10-26 03:14:08 +01:00
Heinrich Fenkart
61705d35fa Small clean-up in scrollspy unit test 2014-10-07 06:57:46 +02:00
Chris Rebert
6b7142212f consistently use <nav> instead of <div> for .navbar in docs 2014-08-15 18:09:05 -07:00
fat
587c09cb48 fix scrollspy test in firefox mac os 2014-07-06 21:50:46 -07:00
Jacob
b5d86ad0bd Merge pull request #13853 from hnrch02/unit-tests-cleanup
Major unit tests cleanup
2014-07-06 21:43:48 -07:00
Mark Otto
ac18e5811d jscs fix 2014-07-06 15:08:33 -07:00
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
Heinrich Fenkart
58eb8b2ae3 Move to leading pluses 2014-07-06 11:56:12 +02:00
Heinrich Fenkart
8ff099585f Mention #13500 in comment for ScrollSpy test 2014-07-06 09:24:23 +02:00
Heinrich Fenkart
05ba1e491e Clean scrollspy unit tests up 2014-07-06 09:24:22 +02:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
Mike Robinet
c2e94eba8d Add Scrollspy maxScroll with offset test. 2014-05-13 12:53:54 -05:00
breaddevil
7627b24c1e replace js scrollspy test for default behavior 2014-05-04 11:24:31 +02: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
XhmikosR
45b476bdbf JS: remove unused variables. 2014-04-09 10:01:48 +03: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
XhmikosR
895b0006b9 Re-indent test files. 2014-02-14 11:02:03 +02: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
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
fat
14651035de a bunch javascript junk 2013-05-16 11:06:30 -07:00