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

Ace-Diff proof of concept #1989

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Ace-Diff proof of concept #1989

wants to merge 1 commit into from

Conversation

dometto
Copy link
Member

@dometto dometto commented Aug 1, 2023

A proof of concept for merge functionality using the ace-diff library. Run gollum with --development-assets, open an editor, and execute the following JS for a very basic diff view:

$('#gollum-editor-body-ace').toggle()
const differ = new AceDiff({
  element: '.acediff',
  left: {
    content: window.ace_editor.getSession().getValue(),
  },
  right: {
    content: 'your second file content here',
  },
});
myopts = window.ace_editor.getOptions()
differ.getEditors().left.setOptions(myopts)

@dometto dometto marked this pull request as draft August 1, 2023 20:50
@dometto
Copy link
Member Author

dometto commented Aug 1, 2023

Note: this is meant primarily to store and share info about how to get ace-diff up and running, this is very far from being a real PR. :)

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

Successfully merging this pull request may close these issues.

None yet

1 participant