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.

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

Patch CodeMirror 5.22 #2066

Merged
merged 2 commits into from
Jan 25, 2017
Merged

Patch CodeMirror 5.22 #2066

merged 2 commits into from
Jan 25, 2017

Conversation

minrk
Copy link
Member

@minrk minrk commented Jan 24, 2017

closes #2037

TODO:

@gnestor this PR is from a branch on trunk, so feel free to play around with fixes for the cursor issue in this PR

I can't work on a fix because I can't reproduce #1967 (Safari 10.0.3 or 10.2 preview)

Assuming the fix is simple, we might consider a patch-level backport to 4.3.2 as well.

@minrk minrk added this to the 5.0 milestone Jan 24, 2017
@gnestor
Copy link
Contributor

gnestor commented Jan 24, 2017

@minrk I've submitted #2068 to merge into this branch.We shoud have a fix on CodeMirror's end eventually (see codemirror/codemirror5#4454), but this will allow us to ship 4.3.2.

@minrk
Copy link
Member Author

minrk commented Jan 24, 2017

Maybe it would be better to patch in-place after bower install, rather than track the modified file whole? Otherwise, I think we're at risk of clobbering the file on bower install, etc. That might be related to the error on Windows, I'm not sure.

@gnestor
Copy link
Contributor

gnestor commented Jan 25, 2017

Let's include this in 4.3.2 👍

@gnestor gnestor modified the milestones: 4.3.2, 5.0 Jan 25, 2017
@minrk
Copy link
Member Author

minrk commented Jan 25, 2017

@gnestor merged #2068

@gnestor gnestor changed the title [WIP] codemirror 5.22 Patch CodeMirror 5.22 Jan 25, 2017
@minrk minrk merged commit 393a04d into master Jan 25, 2017
@minrk minrk deleted the cm-up branch January 25, 2017 21:39
@gnestor
Copy link
Contributor

gnestor commented Jan 31, 2017

@meeseeksdev backport to 4.x

@Carreau
Copy link
Member

Carreau commented Jan 31, 2017

@meeseeksdev backport to 4.x

Ok, I think I see the bug ...

@lumberbot-app
Copy link

lumberbot-app bot commented Jan 31, 2017

Oops, something went wrong applying the patch... Please have a look at my logs.

Carreau pushed a commit to Carreau/jupyter_notebook that referenced this pull request Jan 31, 2017
Merge pull request jupyter#2066 from jupyter/cm-up

Patch CodeMirror 5.22
Carreau pushed a commit to Carreau/jupyter_notebook that referenced this pull request Jan 31, 2017
Merge pull request jupyter#2066 from jupyter/cm-up

Patch CodeMirror 5.22
minrk added a commit that referenced this pull request Jan 31, 2017
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Python 3.6 f-strings break notebook syntax highlighting Spacing in text cells on Safari 10
3 participants