Merge remote-tracking branch 'upstream/master' into jslint
Merge branch 'jslint' of github.com:mauk81/khan-exercises into jslint
Merge remote-tracking branch 'upstream/master' into jslint
use \vec instead of \hat for vector, fix #130222
Merge pull request #135554 from mauk81/patch-3

use \vec instead of \hat for vector, fix #130222
correct color in hint, fix #135751
Add more flexibility to addMovableAngle

Summary:
 * Adds support for coordinate pairs for addMovableAngle points
 * Adds a fixed option to addMovableAngle, which disables the default
   move handling

Test Plan: * Used in the Transformer Widget in Perseus

Reviewers: alex

Reviewed By: alex

CC: alpert

Differential Revision: http://phabricator.khanacademy.org/D5534
Add kray.equal

Test Plan:
Used in perseus transformer widget
TODO: Add unit tests

Auditors: alex
Improved kray.js comment

Test Plan: none; comment-only change

Auditors: alex
Rename or delete some not-deployed exercises files

None of these files are live on the site. Some will soon be deployed with a name different than the filename so I'm taking the opportunity to rename the file before it's deployed and it's still convenient to do so.

Two of these files we don't want to deploy, so I'm deleting them from the repo.

Test Plan: none

Auditors: elizabeth, joel
Save deg/rad mode in localstorage.

Summary: Default to DEG instead of RAD, but save the mode in localstorage if the user switches it.

Test Plan: Load the law_of_cosines exercise and note that it starts in DEG mode, change modes and note that a localstorage entry is created. Refresh the page and note that it remembers what state it was in.

Reviewers: joel

Reviewed By: joel

CC: alpert

Maniphest Tasks: T1987

Differential Revision: http://phabricator.khanacademy.org/D5542
Put fractions_as_division_by_a_multiple_of_10.html in the right place

Test Plan: `ls khan-exercises`

Auditors: joel
Update local-only/update_local.sh and css/khan-site.css

Summary:
I modified update_local.sh to work with the latest version of kake, and ran
it to update css/khan-site.css

Test Plan:
 * python -m SimpleHTTPServer 7000
 * visit http://localhost:7000/exercises/adding_vectors.html
 * everything looked fine
 * crossed my fingers

Reviewers: csilvers

Reviewed By: csilvers

CC: eater, alpert

Differential Revision: http://phabricator.khanacademy.org/D5559
adjust calculator test
Merge pull request #137332 from mauk81/test

adjust calculator test
Add more style options to graphie.addCircleGraph

Summary:
Adds normal/highlight style options for both the circle and the center
point in graphie.addCircleGraph()

Test Plan:
 * Make an interactive-graph with a circle in Perseus
 * Verify that the circle is blue, but highlights orange
   on hover
 * Orange/orange used in a new Transformer commit
 * There's a known bug related to stroke-dasharray :(

Reviewers: alex

Reviewed By: alex

CC: alpert

Differential Revision: http://phabricator.khanacademy.org/D5570
Update css/khan-site.css with simple-button exercise-orange

Summary:
ran local-only/update_local.sh

Test Plan: none
Add graphie.addReflectButton for Perseus Transformer widget

Summary:
Adds a function to place a reflection button, similar to the rotation
handle.

Test Plan:
Refactor perseus transformer widget to use this function, then test
 * moving the reflection line's points
 * dragging the reflection line itself
 * reflecting polygons

Reviewers: alex

Reviewed By: alex

CC: alpert

Differential Revision: http://phabricator.khanacademy.org/D5594
Turn reflectButton into two triangles instead of a circle

Summary:
Replaces the circle point created by addReflectButton with a pair of
triangles.

Test Plan:
 * Use it in the transformer widget from D5596
 * Try adding a reflect tool and dragging the line around
 * Try reflecting points
 * Try removing and adding the reflect tool and check that the old
   button is not still clickable

Reviewers: alex

Reviewed By: alex

CC: alpert, khirasaki

Differential Revision: http://phabricator.khanacademy.org/D5601
add tests for kray util