Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some XSS in v3 #23687

Merged
merged 1 commit into from
Sep 14, 2017
Merged

Fix some XSS in v3 #23687

merged 1 commit into from
Sep 14, 2017

Conversation

Johann-S
Copy link
Member

@Johann-S Johann-S commented Aug 26, 2017

js/carousel.js Outdated
@@ -208,8 +208,11 @@
var clickHandler = function (e) {
var href
var $this = $(this)
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
var target = $this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7

Choose a reason for hiding this comment

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

Line is too long.

@Johann-S
Copy link
Member Author

Error in our gh_pages 🤔
https://travis-ci.org/twbs/bootstrap/jobs/268638535#L546

@XhmikosR
Copy link
Member

Yeah, I don't think this branch is right. We have changes in v3-dev branch and that is what you should target.

@Johann-S
Copy link
Member Author

Johann-S commented Aug 26, 2017

@mdo made a lot of work in this branch see : https://github.com/twbs/bootstrap/commits/v3.4.0-dev
maybe instead you should put your work on this branch

js/carousel.js Outdated
@@ -208,8 +208,13 @@
var clickHandler = function (e) {
var href
var $this = $(this)
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
var target = $this.attr('data-target')
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7

Choose a reason for hiding this comment

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

Line is too long.

@XhmikosR
Copy link
Member

But all I'm saying it's just when Mark is done, he should merge his changes in v3-dev. v3.4.0 seems a lot more specific, more of a WIP branch that will be merged to the base v3-dev one when done.

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