Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Perseus and fix fonts #4965

Merged
merged 8 commits into from
Mar 9, 2016
Merged

Upgrade Perseus and fix fonts #4965

merged 8 commits into from
Mar 9, 2016

Conversation

rtibbles
Copy link
Member

@rtibbles rtibbles commented Mar 4, 2016

Summary

This PR updates our bundled version of Perseus, as we were two major versions behind Khan Academy. It also bundles in Font Awesome, which is required by Perseus (and has been for a long time) but somehow we had ommitted it.

TODO

  • New dependencies (if any) added to requirements file

Reviewer guidance

A lot of this is boiler plate/built code, in terms of what has actually changed in our codebase, look in perseus-helpers.js.

Issues addressed

Fixes #4857, and fixes #3587.

Screenshots (if appropriate)

They're nice. :)
image

image

rtibbles added 6 commits March 3, 2016 16:40
@rtibbles
Updates perseus.
d018f38
@rtibbles
Squashed 'kalite/distributed/static/js/distributed/perseus/ke/' chang…
612aed1 
…es from 98c30e8..dcdae8a

dcdae8a Merge branch 'master' of github.com:learningequality/khan-exercises
c6d1db7 Merge branch 'ka_master'
1070e1b Update the eslint-disable directives.
e041278 Fix timestamp on attempt data to work across locales.
ed03ce4 Change wording for incorrect answers to be more encouraging
2c1bf12 Don't depend on `KA.getUserID` existing.
8076e90 Properly clean up after a problem when using interfaceFunctions
486f553 Add callbacks for state change in ExerciseProblemTemplate (Bibliotron Execises part 8b)
156610b Check for existence of data object when looking for skipDOMManipulation
7b500fd Expose checkAnswer, skipQuestion, gotoNextProblem, and showHint to webapp (Bibliotron Exercises part 7b)
67d879b Pass a flag to problemTemplateRendered to skip DOM manipulation (Bibliotron Exercises part 5b)
7521aa6 Add imperative `showHint(hintNumber)` function
0eb9b02 Allow clients to interact imperatively w/ interface.js (starting with handleAttempt)
f14fc0c Prevent race condition in calculator modules
38e79db Refactored calculator UI code to a separate module
87db7a5 Make sure a string is passed into JSON.parseString
0d566a4 Enable anti-cheating code.
f5d0d31 Differentiate between error types when failing to load an exercise.
32eef88 Don't point people to GitHub to report content issues
ccbe215 Explicitly require base modules
b401c13 Answer major question in README.
29e48f8 Do not assume window.localStorage's presence implies usability
eb7d469 Reintroduce offline cheating detection.
78c9279 Merge pull request #161545 from Khan/brownhead-update-readme
2630d00 Add some text to ellipse_intuition to help explain the exercise better.
0a0e86d Cleanup README and make status clearer.
6163e8f Merge pull request #161539 from Christi/patch-1
a189f3a Update division 1.5 to remove 2 digit divisors...
665ac66 Merge pull request #161433 from rhc2104/patch-1
2dcc902 Merge pull request #161495 from mankal111/master
ae60143 Add support for two new problem-error types.
792a916 Add missing apostrophe
895f133 Change histogram to dotplot
54c6269 Reword question
7df5e51 Make coordinate plural
85b53ad Update khan-exercises to remove all references to Jed.
95e2c88 Fix $_ in local i18n.js so that Perseus can use it when running locally
3ca2d5e Simplify the local-only script since i18n.js already defines window.i18n.
bd4e680 Change from $._ and $.ngettext over to i18n._ and i18n.ngettext.
373c111 Copy over an ES5-compatible version of i18n.js.
8104630 Update the local files, and update the local script as well.
a27f4d7 Fix the regexp for arc lint to correctly only match a single line.
cf7b219 Add a bunch of eslint-disable comments for legacy code.
4e8bdb3 Add more specific types to fix 2 exercises on mobile
52402da Add processText function.
f83f6c0 Temporarily don't detect offline hints.
3a4a070 Revert change to remove mathzoom from khan-exercises
c4addc0 Remove MathZoom from kathjax.py, and rebuild MathJax
90a4af4 Send Travis alerts to Slack instead of HipChat
1c6a1f0 Fix rounding whole numbers
6bb8c50 Remove MathZoom.js from MathJax
2fe3d31 Update standard_deviation_of_a_population.html
9a7495c Add MathZoom.js to MathJax for real
3870ebc Add MathZoom.js extension to third_party MathJax.
d59065a Change equal sign to approx if MEAN is rounded
8f87810 Limit places to places we have names for
4a37397 Prevent cheating with offline hints.
c953f4d Remove ServerActionQueue from interface.js.
c2266bd Increase the range of questions
a660f4c Remove questions with radians
64001df Don't show related videos in skill checks
0b1d12c Fix lint in build/pack.js again.
7cf3890 Add data-type="text" to points_lines_and_planes for mobile testing.
6b5f477 Fix lint in interface.js
6e6b893 Lint fixes for pack.js script
0f1927e khan-exercises should be usable without KA globals
19994c4 Simplify question and have consistent wording of variation
21c4118 Fix "adding decimals" on iPad
89cb60f Fix comparing_fractions_1 freezing issue again.
576d765 Fix hints
93154c4 Add missing plus sign to equation
02cd36f Remove redundant words (angle)
2fdf1c2 Fix test for point in shaded area
4d272bd Avoid a denominator that imposes impossible constraints
51587a0 Revert "Removing gandalf bridge"
e4f1c17 Removing gandalf bridge
054e319 Update copyright on README

git-subtree-dir: kalite/distributed/static/js/distributed/perseus/ke
git-subtree-split: dcdae8a3760b99e647866ce9a7a0585165feaf86
@rtibbles
Merge commit '612aed1956b44eb48f688b83af1ac624ac1dccf2' into perseus_…
db240f2 
…and_fonts

Conflicts:
	kalite/distributed/static/js/distributed/perseus/ke/local-only/i18n.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/algebra-intuition.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/angles.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/answer-types.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/chemistry.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/cipher.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/congruency.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/constructions.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/convert-values.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/crc32.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/derivative-intuition.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/exponents.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/expressions.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/functional.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/geom.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-3d.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-drawing.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-geometry.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-helpers-arithmetic.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-helpers.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-polygon.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/graphie.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/interactive.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/jquery.adhesion.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/khanscript.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/kline.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/kmatrix.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/knumber.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/kpoint.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/kray.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/kvector.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/math-format.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/math.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/matrix-input.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/mean-and-median.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/objective_.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/parabola-intuition.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/polynomials.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/probability.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/qhints.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/rational-expressions.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/scratchpad.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/slice-clone.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/spin.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/stat.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/subhints.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/tex.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/time.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/tmpl.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/transform-helpers.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/triangle-congruence.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/unit-circle.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/visualizing-derivatives.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/word-problems.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/wrapped-defaults.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/wrapped-ellipse.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/wrapped-line.js
	kalite/distributed/static/js/distributed/perseus/ke/utils/wrapped-path.js
@rtibbles
Integrates latest version of Perseus into KA Lite.
68a92e5
@rtibbles
Adds font-awesome to fix some font rendering issues.
f0a3235
@rtibbles
Use glyphicons instead of unicode character for attempt history bar.
b6f6f4e
@rtibbles rtibbles added this to the 0.16.0 milestone Mar 4, 2016
@rtibbles rtibbles added the has PR label Mar 4, 2016
@rtibbles
Copy link
Member Author

rtibbles commented Mar 4, 2016

@radinamatic I can't write automated tests of this - in lieu, could you do a quick pass of exercises (including the font problematic ones) on this?

@radinamatic
Copy link
Member

Sure, random selection of exercises at my discretion? Since I have no way of knowing which would fail...

@rtibbles
Copy link
Member Author

rtibbles commented Mar 4, 2016

Yes, as well as the specific triangle one in the issue above.

And XP testing for the correct/incorrect icons!

@MCGallaspy MCGallaspy mentioned this pull request Mar 7, 2016
Closed
@benjaoming
Copy link
Contributor

@rtibbles any known issues about this? looking at the screenshot, it seems that the points box is misplaced?

@rtibbles
Copy link
Member Author

rtibbles commented Mar 7, 2016

Not quite sure what you mean, @benjaoming? The slight misalignment of the crosses and check marks?

This was referenced Mar 7, 2016
Closed
Closed
@benjaoming
Copy link
Contributor

The points collected box used to be above the other boxes?

On 7 March 2016 at 20:46, Richard Tibbles [email protected] wrote:

Not quite sure what you mean, @benjaoming https://github.com/benjaoming?
The slight misalignment of the crosses and check marks?

—
Reply to this email directly or view it on GitHub
#4965 (comment)
.

@rtibbles
Copy link
Member Author

rtibbles commented Mar 7, 2016

It still is - there are two screenshots there :)

@benjaoming
Copy link
Contributor

oh strangeness, maybe it's my internet connection that didn't load
everything... I should've taken a screenshot of your screenshot so you
could've known what I meant :D

On 7 March 2016 at 21:48, Richard Tibbles [email protected] wrote:

It still is - there are two screenshots there :)

—
Reply to this email directly or view it on GitHub
#4965 (comment)
.

@radinamatic
Copy link
Member

Still getting some 404s in the console, but everything displays OK in the UI @rtibbles! :)

ie8 - winxp 0 16 build 167 running - oracle vm virtualbox_265

@rtibbles
Copy link
Member Author

rtibbles commented Mar 8, 2016

OK, will fix up some of those 404s and merge.

@radinamatic
Copy link
Member

👍

@rtibbles
Copy link
Member Author

rtibbles commented Mar 9, 2016

Merging.

rtibbles added a commit that referenced this pull request Mar 9, 2016
@rtibbles
Merge pull request #4965 from rtibbles/perseus_and_fonts
e048657 
Upgrade Perseus and fix fonts
@rtibbles rtibbles merged commit e048657 into learningequality:0.16.x Mar 9, 2016
@rtibbles rtibbles deleted the perseus_and_fonts branch March 9, 2016 00:29
@rtibbles rtibbles removed the has PR label Mar 9, 2016
@rtibbles rtibbles mentioned this pull request Mar 9, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@radinamatic radinamatic

Labels
None yet
Projects
None yet
Milestone
0.16.0
Development

Successfully merging this pull request may close these issues.
3 participants
@rtibbles @radinamatic @benjaoming