Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Update to latest CodeMirror upstream master #2904

Merged
merged 1 commit into from
Feb 19, 2013
Merged

Conversation

njx
Copy link
Contributor

@njx njx commented Feb 19, 2013

  • Update SHA to our CodeMirror fork's master, which is now clean with upstream
    (brackets-sprint20 branch in the adobe/CodeMirror2 fork is no longer needed)
  • Fix htmlmixed mode to specify parameters for handling mustache/handlebars
    templates, as required by latest CodeMirror
  • Reinstate commented-out unit tests from Block uncomment throws exception near bottom of file #2887 since the underlying CM bug
    should now be fixed

@redmunds - assigning to you to review the htmlmixed update.

- Update SHA to our CodeMirror fork's master, which is now clean with upstream
  (brackets-sprint20 branch in the adobe/CodeMirror2 fork is no longer needed)
- Fix htmlmixed mode to specify parameters for handling mustache/handlebars
  templates, as required by latest CodeMirror
- Reinstate commented-out unit tests from #2887 since the underlying CM bug
  should now be fixed
@ghost ghost assigned redmunds Feb 19, 2013
@redmunds
Copy link
Contributor

@njx htmlmixed update looks good.

@redmunds
Copy link
Contributor

@njx Is there more reviewing that you want done, or should I merge it?

@njx
Copy link
Contributor Author

njx commented Feb 19, 2013

No, I think you can just merge (the only other change is the uncommenting-out of a couple of EditorCommandHandlers unit tests--feel free to run them to make sure they work on your machine :), but if not jenkins will catch it).

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants