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

[MERGE WITH GITFLOW] Hotfix-wagtail html editing #1450

Closed
wants to merge 2 commits into from

Conversation

johnnyporkchops
Copy link
Contributor

@johnnyporkchops johnnyporkchops commented Nov 4, 2017

Issue : https://github.com/18F/fec-cms/issues/1415
Restores ace-builds noconflict js files to allow html editing. Tested locally on Master

  • This is a node module that is not being included: fec-cms/node-modules/ace-builds
  • In this hotfix, the files are just included in /static/js/vendor which might not be correct, but works to restore editing until we can fix the build to include it

@johnnyporkchops johnnyporkchops changed the title restored ace-builds nocoflict js files to allow html editing restored ace-builds noconflict js files to allow html editing Nov 4, 2017
@johnnyporkchops johnnyporkchops changed the title restored ace-builds noconflict js files to allow html editing [MERGE WITH GITFLOW] Fixes wagtail html editing Nov 4, 2017
@codecov-io
Copy link

Codecov Report

Merging #1450 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #1450   +/-   ##
======================================
  Coverage    79.4%   79.4%           
======================================
  Files          46      46           
  Lines        3297    3297           
  Branches      497     497           
======================================
  Hits         2618    2618           
  Misses        679     679

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 083519c...43f45af. Read the comment docs.

@johnnyporkchops johnnyporkchops changed the title [MERGE WITH GITFLOW] Fixes wagtail html editing [MERGE WITH GITFLOW] Hotfix-wagtail html editing Nov 5, 2017
Copy link
Contributor

@ccostino ccostino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johnnyporkchops and I spoke about these changes and discussed why this isn't the right approach - we'd only end up copying pieces of a module into a build pipeline-managed directory by going this route, which will likely cause numerous maintenance issues and likely still result in a broken module that we're trying to use.

Please see the parent issue (#1415) for more information.

/cc @xtine

@xtine
Copy link
Contributor

xtine commented Nov 9, 2017

This has been fixed by https://github.com/18F/fec-cms/pull/1478.

@xtine xtine closed this Nov 9, 2017
@LindsayYoung LindsayYoung deleted the hotfix/fix-html-edit-bug branch February 2, 2018 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants