Permalink
Commits on May 22, 2013
  1. Make sure that some block elements are not in extracted strings. Add …

    …it to the linter to avoid regressions. Fix the one regression.
    
    Summary: This makes it so that P and DIV elements contained within an extracted string and considered to be linter errors (this matches the tests in `extract_strings_test.py`).
    
    Test Plan: Run `python lint_i18n_strings.py` and there should be no errors (although if the change to `basic_set_notation.html` is reverted then there is an error).
    
    Reviewers: csilvers
    
    Reviewed By: csilvers
    
    CC: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D2399
    committed May 22, 2013
Commits on May 21, 2013
  1. @spicyj

    Hide/show hint box on every problem, incl perseus

    Auditors: benkomalo, eater
    spicyj committed May 21, 2013
  2. @spicyj

    Refactor interactive.js to not use currentGraph

    Auditors: eater
    spicyj committed May 21, 2013
  3. @csilvers

    Fix the html here -- remove an extra </span>.

    This lets HTMLParser parse all of exercises/.  Huzzah!
    
    Auditors: alpert, john
    
    Test Plan:
    Ran my htmlparser based string extractor and had it succeed.  But
    mostly, manual examination of the html.
    csilvers committed May 21, 2013
  4. Make it so that ambiguous plural errors can be programmatically re-en…

    …abled. Then re-enable them in the lint tests.
    committed May 21, 2013
Commits on May 20, 2013
  1. @xymostech

    i18nize a bunch of javascript files

    Summary: i18nize (most of) interface.js, history.js, khan-exercise.js, word-problems.js
    
    Test Plan: Visit the site, see that it doesn't break
    
    Reviewers: john, csilvers, eater, alpert
    
    Reviewed By: john
    
    CC: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D2362
    xymostech committed May 20, 2013
  2. @xymostech

    Use plural_form to pluralize fruits/deskitems

    Summary:
    fruits and desk items are now Plural items, so plural_form needs to be
    used to pluralize them. I'm not sure if this is the correct approach (as @john
    didn't do this before) but it does make the exercise appear correctly.
    Sometimes there are errors because "X" and "Y" aren't plural objects, but that
    isn't shown to the user and looks fine.
    
    Test Plan:
    Go to
    http://sandcastle.khanacademy.org/media/castles/xymostech:fix-linear-equations/exercises/interpreting_linear_equations.html?debug&problem=increase&seed=21
    See that it doesn't show "undefined" everywhere
    
    Reviewers: eater, alpert, john
    
    Reviewed By: john
    
    Differential Revision: http://phabricator.khanacademy.org/D2359
    xymostech committed May 20, 2013
Commits on May 17, 2013
  1. @xymostech

    Revert "Allow unsimplified fractions in slope question"

    This reverts commit f0f9356.
    xymostech committed May 17, 2013
  2. @xymostech

    Make creating_bar_charts_1 show fruits correctly

    Fruits are the new plural-y objects, we need to convert them to strings
    before using in labels.
    
    Auditors: eater, alpert
    xymostech committed May 17, 2013
  3. @benkomalo

    Don't allow a resubmission after q is completed

    Summary:
    Some students showed me a repro step of showing the red error bar that was
    kind of weird. Not exactly sure how they were doing this, but if you get
    a question right, and then modify the input and press enter again accidentally,
    it would confuse the server and show an error bar.
    
    This change just makes it so that you can't submit another answer once you get
    it right.
    
    Test Plan:
    in an exercise, get all the hints, then get the right answer, proceeded
    get a wrong answer, then get a right answer, proceeded
    get a wrong answer, then a right answer, then click in the box and modify it
       and press enter and make sure it didn't do anything. click on the next
       question button and proceed
    
    Reviewers: eater, alpert
    
    Reviewed By: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D2356
    benkomalo committed May 17, 2013
  4. @spicyj

    Use KA colors

    Auditors: eater
    spicyj committed May 17, 2013
  5. @spicyj

    Reprocess MathJax styles on subhint reveal

    MathJax does crazy stuff with metrics and so doesn't work very well if
    the math isn't visible at the time of typesetting, so we tell it to redo
    the metrics after it's visible.
    
    Auditors: alex
    spicyj committed May 17, 2013
  6. @xymostech

    Merge pull request #45260 from jeresig/i18n

    i18n Linter and Auto-fixer
    xymostech committed May 17, 2013
  7. @benkomalo

    Pass card data when triggering hintUsed

    Test Plan: opened an exercise, took a hint, made sure it didn't blow up
    
    Reviewers: alpert
    
    Reviewed By: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D2353
    benkomalo committed May 17, 2013
Commits on May 16, 2013
  1. @xymostech

    Allow unsimplified fractions in slope question

    Because this deals with slopes, it's reasonable for a student to put in
    an unsimplified fraction when figuring out the rise/run.
    
    Auditors: eater, alpert
    xymostech committed May 16, 2013
  2. Fix sentence formatting.

    committed May 16, 2013
  3. Merge with stable master.

    committed May 16, 2013
  4. @xymostech

    Remove reference to non-existant "B" variable

    Summary:
    In the a-o-xmk and a-o-xmk2 answer-types of limits_2, there's a "B"
    variable that isn't defined, but it renders fine without it (and the
    question/answer still makes sense). So, if not running in debug mode,
    the exception is caught and ignored, and the error goes unseen. This
    removes all references to "B", which fixes everything.
    
    Test Plan:
    Visit
    http://sandcastle.khanacademy.org/media/castles/xymostech:fix_limits_2/exercises/limits_2.html?debug&problem=a-o-xmk
    and see that it doesn't break
    
    Reviewers: alpert, eater
    
    Reviewed By: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D2344
    xymostech committed May 16, 2013
Commits on May 15, 2013
Commits on May 14, 2013
  1. Add some additional comments to clarify _check_plural_is_ambiguous an…

    …d re-write the logic a bit.
    committed May 14, 2013
  2. @tzjames

    Only respect server side lastCountHints and lastAttmeptNumber if firs…

    …t page load.
    
    Summary: People have said they have seen hints pre-filled in when it is not the first problem Khan#45794.  As both lastCountHints and lastAttemptNumber get set to 0 when problemDone is triggered and any out of date updateUserExercise should then get ignored in userExerciseCache _set. Hence I am not sure how this is happening, but hopefully this should fix it.  It should also make sure problems dont appear with hints filled in on the non-first problem loaded when in topic/mastery mode.
    
    Test Plan: cross-fingers
    
    Reviewers: alpert
    
    Reviewed By: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D2319
    
    Auditors: alpert
    tzjames committed May 14, 2013
Commits on May 13, 2013
  1. @spicyj

    Disable hint button after taking hints with reload

    Auditors: alex, james
    spicyj committed May 13, 2013
  2. @beneater

    Adjust a conditionl.

    Test plan: Open number_line multiple times in the athena branch and try dragging the point.
    
    Auditors: alpert
    beneater committed May 13, 2013
  3. @spicyj

    Hide acceptable formats element on load

    ...because a disappearing blob looks weirder than an appearing one.
    
    Auditors: eater
    spicyj committed May 13, 2013
Commits on May 10, 2013
  1. Merge with master.

    committed May 10, 2013
  2. @spicyj

    Make numbers in problem more mathy

    Auditors: eater
    spicyj committed May 10, 2013
Commits on May 9, 2013
  1. @tzjames

    Initialize new problems to have the attempts and hints the server say…

    …s already have happened.
    
    Summary: UserExerciseCache will now send down the lastCountHints and lastAttemptNumber that we can use to initialize the hints and the attempt_number respectively.  This will ensure that attempt_problem will accurately determine if it is indeed a first_response if someone refreshes.  If we eventually trigger hintUsed on $(Exercises) it will also make it clear to the user that refreshing doesn't allow them to cheat.
    
    Test Plan:
    Do a problem incorrectly.
    Refresh the page.
    Do the problem correctly and confirm that attempt_number=2 is sent to the server
    Take a Hint.
    Refresh the page.
    Make sure the hint shows.
    Answer the problem correctly and make sure that hints_used=1.
    
    Reviewers: alpert, benkomalo, jace
    
    Reviewed By: alpert
    
    CC: alex
    
    Differential Revision: http://phabricator.khanacademy.org/D2274
    tzjames committed May 9, 2013
  2. @benkomalo

    Ignore generated deploy files

    Test Plan: crossed fingers
    
    Reviewers: alpert, csilvers
    
    Reviewed By: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D2265
    benkomalo committed May 9, 2013
Commits on May 8, 2013
  1. @spicyj

    Separate out grid and canvas ranges for graphInit

    Auditors: eater
    spicyj committed May 8, 2013