-
-
Notifications
You must be signed in to change notification settings - Fork 78.9k
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
Fix some XSS in v3 #23687
Conversation
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Line is too long.
Error in our |
Yeah, I don't think this branch is right. We have changes in v3-dev branch and that is what you should target. |
@mdo made a lot of work in this branch see : https://github.com/twbs/bootstrap/commits/v3.4.0-dev |
3c3e598
to
603f925
Compare
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Line is too long.
603f925
to
d9be1da
Compare
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. |
Fixes #20184 / CVE-2016-10735.