Skip to content
Browse files

Make unit circle accept fractions

Summary: Closes #39525.

Test Plan: Answered -1/2 and 0.866 (to two different questions), both were accepted.

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D2016
  • Loading branch information...
1 parent 88987c1 commit e5ef619c729be6a6949ec2b3204b44d8af25ce9e @spicyj spicyj committed
Showing with 8 additions and 6 deletions.
  1. +1 −1 exercises/unit_circle.html
  2. +7 −5 khan-exercise.js
View
2 exercises/unit_circle.html
@@ -27,7 +27,7 @@
</p>
<div class="solution" data-type="multiple">
- <div class="sol" data-type="decimal" data-inexact data-max-error="0.001" required><var>SOLUTION</var></div>
+ <div class="sol" data-inexact data-max-error="0.001" required><var>SOLUTION</var></div>
<div class="sol" data-type="custom">
<div class="instruction"></div>
View
12 khan-exercise.js
@@ -369,7 +369,7 @@ var Khan = (function() {
// Base modules required for every problem
mods.push(
- "answer-types", "tmpl", "underscore", "jquery.adhesion",
+ "answer-types", "tmpl", "jquery.adhesion",
"hints", "calculator"
);
@@ -723,11 +723,13 @@ var Khan = (function() {
randomSeed = testMode && parseFloat(Khan.query.seed) || userCRC32 ||
(new Date().getTime() & 0xffffffff);
- // Load in jQuery
- if (window.jQuery) {
- onjQueryLoaded();
+ // Load in jQuery and underscore
+ if (testMode) {
+ Khan.loadScript("../jquery.js", function() {
+ Khan.loadScript("../utils/underscore.js", onjQueryLoaded);
+ });
} else {
- Khan.loadScript("../jquery.js", onjQueryLoaded);
+ onjQueryLoaded();
}
function onjQueryLoaded() {

1 comment on commit e5ef619

@spicyj
Khan Academy member

Darn it, somehow I mixed in http://phabricator.khanacademy.org/D2015 here. Oh well.

Please sign in to comment.
Something went wrong with that request. Please try again.