Skip to content

Allows both OL and UL lists for tab buttons - #26702

Merged
Johann-S merged 1 commit into
twbs:v4-devfrom
tiesont:v4-dev
Nov 20, 2018
Merged

Johann-S merged 1 commit into
twbs:v4-devfrom
tiesont:v4-dev

Conversation

@tiesont

@tiesont tiesont commented Jun 11, 2018

Copy link
Copy Markdown
Contributor

Modifies tab.js to allow OL as a parent element for the tab list items.

Duplicates UL-based visual tests to provide OL-based versions.

Adds check for "show" class to tabs unit tests.

Comment thread js/tests/unit/tab.js Outdated

@Johann-S Johann-S left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of your changes are irrelevant

@XhmikosR

Copy link
Copy Markdown
Member

@tiesont: can you take care of @Johann-S's comment?

@XhmikosR

XhmikosR commented Nov 4, 2018

Copy link
Copy Markdown
Member

Closing due to lack of response. You can comment here and we can re-open it if you decide to resume working on the requested changes.

@XhmikosR XhmikosR closed this Nov 4, 2018
@tiesont

tiesont commented Nov 6, 2018

Copy link
Copy Markdown
Contributor Author

I can fix this, I suppose, but I'm not sure what exactly is the issue here - I added those tests to make sure the plugin actually works with both UL and OL markup, which was the whole point of the original issue. Should I assume what you want is just the

assert.strictEqual($('#qunit-fixture').find('.show').attr('id'), 'home')

test? Or, do you only want the tests in tab.js?

@XhmikosR XhmikosR reopened this Nov 6, 2018
@Johann-S

Johann-S commented Nov 6, 2018

Copy link
Copy Markdown
Member

That's right, you just have to create one new test, with <ol> list, which show it works 👍

@tiesont

tiesont commented Nov 7, 2018

Copy link
Copy Markdown
Contributor Author

One unit test (which should already be there) or one visual test (which is also already there)? Is the issue that I modified the existing visual test to indicate which was UL-based and which was OL-based?

@Johann-S

Johann-S commented Nov 9, 2018 •

Copy link
Copy Markdown
Member

@tiesont the reason is, you have unrelated changes.
Your fix should be:

image

And that's all because ordered list works, but with your fix we use the correct selector, so the use case is already covered

@tiesont
tiesont requested a review from a team as a code owner November 12, 2018 00:50
@tiesont

tiesont commented Nov 12, 2018

Copy link
Copy Markdown
Contributor Author

Okay, I'll admit that I'm not all that great at using Git (or GitHub, for that matter). I pulled down the 4.1.3 source, merged the updated tab.js file, and then made the updates to allow OL as a selector. I reverted the changes I made to the unit test and visual test files to match what is in this branch.

@Johann-S

Copy link
Copy Markdown
Member

I updated your branch and removed unrelated changes.

For me we should add one thing, it's a little note on our documentation to show we accept <ol> too 🤔
You can edit that file to do that: https://github.com/twbs/bootstrap/blob/v4-dev/site/docs/4.1/components/navs.md#base-nav

@Johann-S

Copy link
Copy Markdown
Member

@XhmikosR do you know why Github tells me there are conflicts here ? I resolved all the conflicts 😟

@XhmikosR

Copy link
Copy Markdown
Member

I don't see any conflicts here.

@XhmikosR

Copy link
Copy Markdown
Member

Ah, I see it now. It's shown if you switch Rebase and merge. Because there's a merge commit.

@Johann-S
Johann-S merged commit ab18338 into twbs:v4-dev Nov 20, 2018
@Johann-S

Copy link
Copy Markdown
Member

Thank you @tiesont 👍

@mdo mdo mentioned this pull request Nov 20, 2018
@tiesont

tiesont commented Nov 20, 2018

Copy link
Copy Markdown
Contributor Author

@Johann-S No problem. Thank you for being patient with me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants