Permalink
Browse files

Upgrade jQuery UI and fix the shake

Auditors: eater, cbhl
  • Loading branch information...
1 parent 57b946c commit bb184047400ae1f38c297bbab3ee5c7e561f72dc @spicyj spicyj committed Mar 6, 2013
Showing with 12,650 additions and 9,102 deletions.
  1. +3 −1 exercises/khan-exercise.html
  2. +2 −1 khan-exercise.js
  3. +12,645 −9,100 utils/jquery-ui.js
@@ -31,7 +31,9 @@
<div id="solutionarea" class="fancy-scrollbar"></div>
<ul id="examples" style="display: none"></ul>
<div class="answer-buttons">
- <input type="button" class="simple-button green" id="check-answer-button" value="Check Answer"/>
+ <div class="check-answer-wrapper">
+ <input type="button" class="simple-button green" id="check-answer-button" value="Check Answer"/>
+ </div>
<input type="button" class="simple-button green" id="next-question-button" style="display:none;" name="correctnextbutton" value="Correct! Next Question..."/>
<div id="positive-reinforcement"><img src="/images/face-smiley.png" /></div>
<span id="show-solution-button-container"></span>
View
@@ -2136,7 +2136,8 @@ var Khan = (function() {
// If incorrect, warn the user and help them in any way we can
if (pass !== true) {
checkAnswerButton
- .effect("shake", {times: 3, distance: 5}, 80)
+ .parent() // .check-answer-wrapper makes shake behave
+ .effect("shake", {times: 3, distance: 5}, 480)
.val("Try Again");
// Is this a message to be shown?
Oops, something went wrong. Retry.

0 comments on commit bb18404

Please sign in to comment.