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

Loads jquery 2.0.0 instead of failing back to 1.7.1 #158

Merged
merged 1 commit into from May 22, 2013

Conversation

Projects
None yet
3 participants
@kberridge
Contributor

kberridge commented May 20, 2013

Fixes an issue with jquery.hotkeys where any keystroke would cause the profiler UI to toggle. When 2.0.0 is used, or any version before 1.7, jquery.hotkeys will hook up special events to the wrong version of jquery (not the one miniprofiler loads: 1.7.1). This change fixes it only for 2.0.0.

Loads jquery 2.0.0 instead of failing back to 1.7.1
Fixes an issue with jquery.hotkeys where any keystroke would cause the profiler UI to toggle.  When 2.0.0 is used, or any version before 1.7, jquery.hotkeys will hook up special events to the wrong version of jquery (not the one miniprofiler loads: 1.7.1).  This change fixes it only for 2.0.0.
@SamSaffron

This comment has been minimized.

Owner

SamSaffron commented May 22, 2013

seems fine cc @dixon

SamSaffron added a commit that referenced this pull request May 22, 2013

Merge pull request #158 from kberridge/patch-1
Loads jquery 2.0.0 instead of failing back to 1.7.1

@SamSaffron SamSaffron merged commit e2e00d5 into SamSaffron:master May 22, 2013

@jeradrose

This comment has been minimized.

Contributor

jeradrose commented on 5d0ba94 Jun 20, 2013

This change breaks IE. The expressions are not grouped and thus the jQueryVersion[0] tries to evaluate even when jQueryVersion is undefined.

Fix would be to do something like this:

if (jQueryVersion && ((parseInt(jQueryVersion[0]) == 2) || (parseInt(jQueryVersion[0]) < 2 && parseInt(jQueryVersion[1]) >= 7))) 

Basically, add parens surrounding the second thru fourth expressions.

@kberridge kberridge deleted the kberridge:patch-1 branch Apr 6, 2017

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