Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 15, 2015
  1. Emily Eisenberg

    Fix up graphing inequalities exercises (for mobile)

    xymostech authored
    Summary:
    Make some changes to the different graphing inequalities
    exercises so that they're more mobile friendly. The main change is
    making the checkboxes and radio buttons play nicely with the funky
    styling we put on them in mobile land, while still looking good in
    non-mobile (done through some `body:not(.mobile)` trickery). Also, add
    some padding to graphs to reduce text collisions, and remove/move around
    some input elements to make more sense.
    
    Test Plan:
     - Visit all 4 exercises locally (not on mobile)
       - See that all of the radio buttons/checkboxes look about the same as
         before
       - Take hints, see no text overlaps
       - See that all of the exercises are still answerable.
     - Visit all 4 exercises on mobile ("Graphing and solving linear
       inequalities", "Graphing linear inequalities in two variables",
       "Graphing systems of inequalities", and "Graphing and solving systems
       of inequalities")
       - See that all of the radio buttons/checkboxes look good and are not
         squished together.
       - Take hints, see that no text overlaps.
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Subscribers: marcos
    
    Differential Revision: https://phabricator.khanacademy.org/D15747
Commits on Nov 20, 2014
  1. MichelleTodd Alex Lopatin

    Rearrange answer area content within some exercises

    MichelleTodd authored alopatin committed
    See https://docs.google.com/a/khanacademy.org/spreadsheets/d/1wCONrsK1ujRCLal7bcxS0cVkfpfKiPzapt3SsMJ_zqI/edit#gid=0
    
    Color: Blue
    
    Test Plan:
    Take all hints and succesfully answer a question within each problem
    type for all modified exercises.
    
    Auditors: alex
  2. Alex Lopatin

    Move all answer area content to the bottom of the question area

    alopatin authored
    Summary:
    This commit moves the entire #solutionarea div to the bottom of the
    question area, unless the question contains an element with the class
    name "render-answer-area-here" (in which case the div is placed
    immediately after this element).
    
    In addition, this commit removes entirely the old "acceptable formats"
    section at the top of the answer area in favor of tooltips attached
    directly to individual input elements. This is basically backporting the
    approach we've taken in Perseus to khan-exercises. Speaking of which,
    this commit also brings the expression editor in khan-exercises more in
    line with the Perseus version (rendered output above input) which is a
    necessary change because otherwise the tooltip obscures the output.
    
    Test Plan:
    Most of these changes were in place during the answer area moving party,
    and so in general all exercises should be confirmed to work. Tooltips
    were only finished afterwards though, so I've spot-checked the various
    answer types myself.
    
    Reviewers: aria
    
    Reviewed By: aria
    
    Subscribers: emily
    
    Differential Revision: http://phabricator.khanacademy.org/D14745
Commits on Jul 28, 2014
  1. Peter Collingridge

    Add 1/3 chance of point being on an inequality

    petercollingridge authored
    Summary:
    Add 'Show me the correct graphs' button
    
    Add 'Show me the correct graph' button to graphing inequalities 1
    
    Add 'Show me the correct graph' button to graphing inequalities 2
    
    Adapt hints to work with points on the line
    
    whitespace
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D10301
Commits on Apr 23, 2014
  1. Ben Eater

    Keep the points in front!

    beneater authored
    I find it hard to believe I didn't catch this earlier...
    
    Test Plan:
    1. Load graphing_inequalities.html and graphing_inequalities_2.html in local mode.
    2. Drag a point.
    3. See https://s3.amazonaws.com/uploads.hipchat.com/6574/49847/XZzptRZSBkqtTAz/upload.png instead of https://s3.amazonaws.com/uploads.hipchat.com/6574/49847/jsNjObFKhW6nAHd/upload.png
    
    Auditors: jack
Commits on Mar 5, 2014
  1. Ben Alpert

    Use requirejs for module loading

    spicyj authored
    Summary: Also did some misc cleanup in khan-exercise.js, mostly related to module-y things ("151 ++----"). I combined local jquery-ui into one file to make it easier to load.
    
    Test Plan:
    Opened addition_1, deriviative_intuition, graphing_points_2 locally, and all looked fine.
    
    In webapp/khan-exercises/, ran:
    
    ```
    npm install -g requirejs
    r.js -o requirejs.config.js
    ```
    
    then saw that /exercises/addition_1 looked right.
    
    Reviewers: eater, jack
    
    Reviewed By: jack
    
    CC: alex
    
    Differential Revision: http://phabricator.khanacademy.org/D7095
Commits on May 29, 2013
  1. Emily Eisenberg

    Fix up most instance of \text{} using the linter

    xymostech authored
    Summary:
    There are a couple cases that had to be fixed up manually, and a lot of
    instances that incorrectly tried to wrap $._ around things that shouldn't be
    translated (mostly the chemistry exercises). There are a couple instances that
    I wasn't sure about (like the "R" in remainder) that I didn't include.
    
    Test Plan:
    Visit the changed exercises, make sure that the exercise renders and
    there were no errors. Take all the hints, and make sure that instances of text
    in mathjax render correctly.
    
    Reviewers: john
    
    Reviewed By: john
    
    CC: alpert, eater
    
    Differential Revision: http://phabricator.khanacademy.org/D2445
Commits on May 16, 2013
  1. John Resig
Commits on May 7, 2013
  1. John Resig
  2. John Resig
  3. John Resig

    Revert linting changes.

    jeresig authored
Commits on Apr 30, 2013
  1. John Resig
Commits on Apr 25, 2013
  1. John Resig
  2. John Resig

    Re-run the linter on the exercises, fixing data-if usage and replacin…

    jeresig authored
    …g entities with characters in data-if attributes.
  3. John Resig

    Merging in with master.

    jeresig authored
  4. John Resig

    Back out latest lint fix.

    jeresig authored
  5. John Resig
Commits on Apr 24, 2013
  1. John Resig
  2. John Resig
  3. John Resig
Commits on Apr 23, 2013
  1. John Resig
  2. John Resig

    Merging in from stable.

    jeresig authored
Commits on Apr 22, 2013
  1. John Resig

    Clean up the newly-changed HTML exercises and also fix up the constan…

    jeresig authored
    …tly-expanding whitespace problem in the cleaner.
Commits on Apr 17, 2013
  1. John Resig
  2. Michael Chang
  3. Michael Chang
Commits on Apr 16, 2013
  1. Michael Chang
  2. John Resig
  3. John Resig
  4. John Resig
  5. John Resig
  6. John Resig
Commits on Apr 15, 2013
  1. John Resig

    Revert recent fixes.

    jeresig authored
  2. John Resig
  3. John Resig
Something went wrong with that request. Please try again.