Skip to content
This repository has been archived by the owner on May 11, 2021. It is now read-only.

Commit

Permalink
Revert a bunch of accidental merge changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeresig
jeresig committed Apr 24, 2013
1 parent d09ea24 commit 7234e86
Show file tree
Hide file tree
Showing 19 changed files with 316 additions and 447 deletions.
4 changes: 2 additions & 2 deletions exercises/adding_and_subtracting_negative_numbers.html
View file
Expand Up @@ -32,7 +32,7 @@
"right" );
</div>
</div>
<div class="solution"><var>ANSWER</var></div>
<div class="solution" data-forms="integer"><var>ANSWER</var></div>
<div class="hints">
<div class="graphie" data-update="numbers">
REMOVE = label( [0, -1],
Expand Down Expand Up @@ -82,7 +82,7 @@
"right" );
</div>
</div>
<div class="solution"><var>ANSWER</var></div>
<div class="solution" data-forms="integer"><var>ANSWER</var></div>
<div class="hints">
<div class="graphie" data-update="numbers">
REMOVE = label( [0, -1],
Expand Down
2 changes: 1 addition & 1 deletion exercises/adding_negative_numbers.html
View file
Expand Up @@ -32,7 +32,7 @@
"right" );
</div>
</div>
<div class="solution"><var>ANSWER</var></div>
<div class="solution" data-forms="integer"><var>ANSWER</var></div>
<div class="hints">
<div class="graphie" data-update="numbers">
REMOVE = label( [0, -2],
Expand Down
22 changes: 20 additions & 2 deletions exercises/basic_set_notation.html
View file
Expand Up @@ -24,21 +24,39 @@
<div class="instruction">Enter the answer as a set, with members separated by commas.
<p><code>\{ </code><input class="text"><code> \}</code>
</p></div>
<div class="guess">$('#solutionarea input').val() </div>
<div class="validator-function">
var guessTrim = guess.replace(/\s/g, "");
var guessArray = guessTrim.length ? _.map(guessTrim.split(","), function(n) { return parseInt(n); }) : [];
return _.isEqual(sortNumbers(guessArray), ANSWER);
</div>
<div class="guess">$('#solutionarea input').val() </div>
<div class="show-guess">$('#solutionarea input').val(guess)</div>
</div>
<div>
<label>
<span class="sol empty-set" data-type="checkbox">
<var>EMPTY_SET</var>
</span>
Empty set
</label>
<div>
</div>
<!--
Hack to not grade an unanswered question.
Note that this custom answer is required. It checks to
see if the textbox is empty xor the checkbox isn't
checked. In that case, the custom validator returns true
and the rest of the multiple answer will be checked
normally. Otherwise, it returns "". Since it's required,
this will cause the entire answer to not be graded.
-->
<div class="sol" data-type="custom" required="">
<div class="guess">
$("#solutionarea input").eq(0).val() === "" ^
!$("#solutionarea input").eq(1).is(":checked")
</div>
<div class="validator-function">
return guess ? true : "";
</div>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions exercises/constructions_1.html
View file
Expand Up @@ -436,8 +436,8 @@
deg = ang * 180 / PI;
origDeg = ROT * 180 / PI;

if (abs(deg - origDeg + 90) &lt; 7 ||
abs(deg - origDeg - 90) &lt; 7) {
if ((abs(deg - origDeg + 90) % 360) &lt; 7 ||
(abs(deg - origDeg - 90) % 360) &lt; 7) {
perp = tool;
}
}
Expand Down
2 changes: 1 addition & 1 deletion exercises/converting_between_point_slope_and_slope_intercept.html
View file
Expand Up @@ -20,7 +20,7 @@
<p>In other words, if the equation is rewritten to look like <code>y = mx + b</code>, what are the values of <code>m</code> and <code>b</code>?</p>
<p><code>y - <var>y1</var> = <var>m</var>(x - <var>x1</var>)</code></p>
<div class="solution" data-type="multiple">
<p><code>y = \space</code><span class="sol short30" data-forms="integer"><var>m</var></span><code>\space \cdot x + \space</code><span class="sol short30" data-forms="integer"><var>b</var></span></p>
<p><code>y = \space</code><span class="sol short30" data-fallback="1" data-forms="integer"><var>m</var></span><code>\space \cdot x + \space</code><span class="sol short30" data-forms="integer"><var>b</var></span></p>
</div>
<div class="hints">
<div>
Expand Down
2 changes: 1 addition & 1 deletion exercises/divisibility_tests.html
View file
Expand Up @@ -21,7 +21,7 @@
<code><var>FACTOR</var></code>?
</p>

<p class="solution"><var>DIVISIBLE ? "Yes" : "No"</var></p>
<p class="solution"><var>DIVISIBLE ? $._("Yes") : $._("No")</var></p>
<ul class="choices" data-category="true">
<li>Yes</li>
<li>No</li>
Expand Down
6 changes: 3 additions & 3 deletions exercises/exponent_rules.html
View file
Expand Up @@ -26,7 +26,7 @@
<var>expr(["*", ["^", BASE, EXP1], ["^", BASE, EXP2]])</var> = <var>expr(["^", BASE, ["+", EXP1, EXP2]])</var>
</code></p>
<p><code>
\hphantom{<var>expr(["*", ["^", BASE, EXP1], ["^", BASE, EXP2]])</var>} = <var>expr(["^", BASE, EXP1 + EXP2])</var>
\hphantom{<var>expr(["*", ["^", BASE, EXP1], ["^", BASE, EXP2]])</var>} = <var>BASE</var>^{<var>EXP1 + EXP2</var>}
</code></p>
</div>
</div>
Expand All @@ -42,7 +42,7 @@
<var>expr(["frac", ["^", BASE, EXP1], ["^", BASE, EXP2]])</var> = <var>expr(["^", BASE, ["-", EXP1, EXP2]])</var>
</code></p>
<p><code>\displaystyle
\hphantom{<var>expr(["frac", ["^", BASE, EXP1], ["^", BASE, EXP2]])</var>} = <var>expr(["^", BASE, EXP1 - EXP2])</var>
\hphantom{<var>expr(["frac", ["^", BASE, EXP1], ["^", BASE, EXP2]])</var>} = <var>BASE</var>^{<var>EXP1 - EXP2</var>}
</code></p>
</div>
</div>
Expand All @@ -58,7 +58,7 @@
<var>expr(["^", ["^", BASE, EXP1], EXP2])</var> = <var>expr(["^", BASE, ["*", EXP1, EXP2]])</var>
</code></p>
<p><code>
\hphantom{<var>expr(["^", ["^", BASE, EXP1], EXP2])</var>} = <var>expr(["^", BASE, EXP1 * EXP2])</var>
\hphantom{<var>expr(["^", ["^", BASE, EXP1], EXP2])</var>} = <var>BASE</var>^{<var>EXP1 * EXP2</var>}
</code></p>
</div>
</div>
Expand Down
109 changes: 38 additions & 71 deletions exercises/khan-site.html
View file
Expand Up @@ -5,50 +5,26 @@
<title>Exercise Template</title>
</head>
<body class="light">
<div id="outer-wrapper">
<div id="page-container">
<div id="page-container-inner">
<div id="fb-root"></div>
<header>
<div id="top-header">
<div class="top-header-links">
<span class="page_links" id="page_auth">
<span class="achievement-badge-counts" style="left:-60px;"></span>
<span><a href="http://khanacademy.org/login">Log in</a></span>
<span class="separator"></span>
<span><a href="http://khanacademy.org/contribute" id="donate-link">Donate</a></span>
</span>
<div class="clear"></div>
<div id="nav-and-search">
<div class="sitewide-navigation">
<nav>
<span class="links nav-subheader">
<span class="dropdown topic-browser-dropdown">
<a href="http://khanacademy.org/#browse" class="watch-link dropdown-toggle">Watch <span class="caret"></span></a>
<a href="http://khanacademy.org/exercisedashboard" class="selected practice-link">Practice</a>
<a href="http://khanacademy.org/class_profile">Coach</a>
<a href="http://khanacademy.org/contribute">Volunteer</a>
<a href="http://khanacademy.org/about">About</a>
</span>
</span>
</nav>
</div>
<div id="search-box">
<form class="page-search" action="/search">
<input class="ui-corner-all placeholder simple-input search-input blur-on-esc ui-autocomplete-input" id="search-input" aria-autocomplete="list" aria-haspopup="true" autocomplete="off" name="page_search_query" placeholder="Search for a video or topic" role="textbox" type="text" value=""><input class="search-submit" id="search-submit" aria-autocomplete="list" aria-haspopup="true" autocomplete="off" role="textbox" type="submit" value=" ">
</form>
</div>
<div class="clear"></div>
</div>
</div>

<div id="logo">
<a href="http://khanacademy.org/" id="logo-image" name="logo-image" title="Khan Academy"></a>
<div id="stats"><span id="page_visitors" style="display: inline;">Over 9,000 lessons delivered</span></div>
</div>
<div class="clear"></div>
</div>
</header>
<div class="clearfix new-header" id="outer-wrapper">
<div id="top-header-container">
<div class="new" id="top-header">
<nav class="sitewide-navigation">
<span class="links nav-subheader">
<span class="dropdown topic-browser-dropdown">
<a href="http://khanacademy.org/library" class="no-menu">Learn</a>
<a href="http://khanacademy.org/class_profile" class="no-menu">Coach</a>
<div style="clear: both"></div>
</span>
</span>
</nav>
<a href="http://khanacademy.org/" id="header-logo" data-tag="Header" title="Take me home!">
<img src="https://khan-academy.appspot.com/images/ka-simplified-logo-white.png">
</a>
</div>
</div>
<div id="page-container">
<div id="page-container-inner">
<div id="fb-root"></div>
<div class="single-exercise visited-no-recolor" id="container" style="overflow: hidden;">
<article class="exercises-content clearfix">
<div class="exercises-header"><h2 class="section-headline">
Expand Down Expand Up @@ -79,37 +55,28 @@
</div>
<div id="end-of-page-spacer" style="height: 38px;">&nbsp;</div>
<div class="badge-award-container" id="badge-notification-container" style="display:none;"></div>
</div>
</div>
</div>
</div>

<div class="push"></div>
<footer class="short" id="footer">
<div id="leaves">
<div class="inner">
<div class="tiny" id="copyright">
<small>©2012 Khan Academy™</small> <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/" id="creative-commons-link" name="creative-commons-link" rel="license"></a>
</div>
<span class="footer-links">
<a href="http://khanacademy.desk.com/">FAQ</a>
<span class="sep">|</span>
<a href="/reportissue?type=Defect&amp;issue_labels=Component-Code%2CExercise-addition_1%2CProblem-1" id="report">Report a Problem</a>
<span class="sep">|</span>
<a href="/about/the-team">Contact</a><a href="/jobs">Jobs</a>
<span class="sep">|</span>
<a href="/about/tos" title="Terms of Service">ToS</a> <a href="/about/privacy-policy" title="Privacy Policy">Privacy Policy</a>
<span class="sep">|</span>
<a href="/downloads">Downloads</a>
<div class="push"></div>
<footer id="footer">
<div class="footer-container">
<div class="row-fluid main-links">
<div class="span2 offset10" style="height: 160px">
<img class="handtree" src="https://khan-academy.appspot.com/images/khan-logo-vertical-transparent.png">
</div>
</div>

<span class="sep">|</span>
<span class="small-social-links">
<a href="http://www.youtube.com/khanacademy" class="google-analytics-link-track youtube" onclick="_gaq.push(['_trackEvent', 'Click', 'Youtube-Subscribe-Header']);" title="Youtube"></a>
<a href="http://twitter.com/khanacademy" class="google-analytics-link-track twitter" onclick="_gaq.push(['_trackEvent', 'Click', 'Twitter-Follow-Header']);" title="Twitter"></a>
<a href="http://www.facebook.com/khanacademy" class="google-analytics-link-track facebook" onclick="_gaq.push(['_trackEvent', 'Click', 'Facebook-Join-Header']);" title="Facebook"></a>
</span>
</span>
<div class="row-fluid extra-links">
<div class="span4 offset8 copyright">
© 2013 Khan Academy<br>
Except where noted, all rights reserved.
</div>
</div>
</footer>
</div>
</footer>


</div>
</body>
</html>
2 changes: 1 addition & 1 deletion exercises/multiplication_1.5.html
View file
Expand Up @@ -32,7 +32,7 @@
graph.multiplier.show();
DUMMY = Array( graph.multiplier.getNumHints() );
</div>
<div class="solution"><var>SMALL_FACTOR * BIG_FACTOR</var></div>
<div class="solution" data-forms="integer"><var>SMALL_FACTOR * BIG_FACTOR</var></div>
</div>
</div>
<div class="hints">
Expand Down
2 changes: 1 addition & 1 deletion exercises/multiplication_1.html
View file
Expand Up @@ -22,7 +22,7 @@
KhanUtil.currentGraph.labelHolder = label( [ 0, B ],
"\\Huge{\\color{#6495ED}{" + A + "} \\times \\color{#28AE7B}{" + B + "} = {?}}", "right" );
</div>
<div class="solution"><var>A * B</var></div>
<div class="solution" data-forms="integer"><var>A * B</var></div>
</div>
</div>
<div class="hints">
Expand Down
2 changes: 1 addition & 1 deletion exercises/multiplication_2.html
View file
Expand Up @@ -21,7 +21,7 @@
graph.multiplier.show();
DUMMY = Array( graph.multiplier.getNumHints() );
</div>
<div class="solution"><var>SMALL_FACTOR * BIG_FACTOR</var></div>
<div class="solution" data-forms="integer"><var>SMALL_FACTOR * BIG_FACTOR</var></div>
</div>
</div>
<div class="hints">
Expand Down
2 changes: 1 addition & 1 deletion exercises/multiplication_3.html
View file
Expand Up @@ -21,7 +21,7 @@
graph.multiplier.show();
DUMMY = Array( graph.multiplier.getNumHints() );
</div>
<div class="solution"><var>SMALL_FACTOR * BIG_FACTOR</var></div>
<div class="solution" data-forms="integer"><var>SMALL_FACTOR * BIG_FACTOR</var></div>
</div>
</div>
<div class="hints">
Expand Down
30 changes: 15 additions & 15 deletions exercises/multiplying_fractions.html
View file
Expand Up @@ -7,31 +7,31 @@
</head>
<body>
<div class="exercise">
<div class="vars" data-ensure="getGCD(A, B) === 1 &amp;&amp; getGCD(C, D) === 1">
<var id="NEG1">randFromArray([1,-1])</var>
<var id="NEG1S">NEG1 === -1 ? "-" : ""</var>
<var id="A">randRange(1, 8)</var>
<var id="B" data-ensure="B&gt;A">randRange(2, 9)</var>

<var id="NEG2">randFromArray([1, -1])</var>
<var id="NEG2S">NEG2 === -1 ? "-" : ""</var>
<var id="C">randRange(1, 8)</var>
<var id="D" data-ensure="D&gt;C">randRange(2, 9)</var>
<div class="vars">
<div data-ensure="getGCD(A, B) === 1">
<var id="A">randRangeNonZero(-8, 8)</var>
<var id="B">randRange(abs(A) + 1, 9)</var>
</div>
<div data-ensure="getGCD(C, D) === 1">
<var id="C">randRange(-8, 8)</var>
<var id="D">randRange(abs(C) + 1, 9)</var>
</div>
</div>

<div class="problems">
<div>
<div class="question">
<p><code>\displaystyle <var>NEG1S</var> \frac{<var>A</var>}{<var>B</var>} \times <var>NEG2S</var> \frac{<var>C</var>}{<var>D</var>}</code></p>
<p><code><span data-if="A &lt; 0">-</span> \dfrac{<var>abs(A)</var>}{<var>B</var>} \times
<span data-if="C &lt; 0">-</span> \dfrac{<var>abs(C)</var>}{<var>D</var>}</code></p>
</div>
<div class="solution" data-type="rational"><var>(NEG1 * A * NEG2 * C) / (B * D)</var></div>
<div class="solution" data-type="rational"><var>(A * C) / (B * D)</var></div>
</div>
</div>

<div class="hints">
<p><code>\displaystyle {} = \frac{<var>NEG1 * A</var> \times <var>NEG2 * C</var>}{<var>B</var> \times <var>D</var>}</code></p>
<p><code>\displaystyle {} = \frac{<var>NEG1 * A * NEG2 * C</var>}{<var>B * D</var>}</code></p>
<p data-if="getGCD(NEG1 * A * NEG2 * C, B * D) !== 1 || NEG1 * NEG2 === -1"><code>\displaystyle {} = <var>fractionReduce(NEG1 * A * NEG2 * C, B * D)</var></code></p>
<p><code>= \dfrac{<var>A</var> \times <var>C</var>}{<var>B</var> \times <var>D</var>}</code></p>
<p><code>= \dfrac{<var>A * C</var>}{<var>B * D</var>}</code></p>
<p data-if="getGCD(A * C, B * D) !== 1 || A * C &lt; 0"><code>= <var>fractionReduce(A * C, B * D)</var></code></p>
</div>
</div>
</body>
Expand Down

0 comments on commit 7234e86

Please sign in to comment.