Skip to content

closes issues #48 #47 #46 #41 - Diff in array not working #49

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

Merged
merged 2 commits into from
May 29, 2018

Conversation

TicaTac
Copy link
Contributor

@TicaTac TicaTac commented May 18, 2018

  • added a small fix : when comparing arrays, we want to get the start position to highlight.
    the path points at a 'value' but there isn't a 'key'.
    this wasn't handled previously, causing arrays to not be highlighted for changes.
    since the start position was empty - the codemirror didn't highlight the change at all.

  • also renamed the color parameter to 'color' (was 'class-name')

  • renamed the path received from the diff to 'path' (was 'key')

@TicaTac TicaTac changed the title closes issue #48 - Diff in array not working closes issues #48 #47 #46 - Diff in array not working May 18, 2018
@TicaTac TicaTac changed the title closes issues #48 #47 #46 - Diff in array not working closes issues #48 #47 #46 #41 - Diff in array not working May 18, 2018
Copy link
Collaborator

@justspamjustin justspamjustin left a comment

Choose a reason for hiding this comment

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

Just remove the debugger comment and I'll get this merged. Thank you!

js/main.js Outdated
@@ -163,6 +163,7 @@
if (!leftJson || !rightJson) return;
var diffs = jsonpatch.compare(leftJson, rightJson);
window.diff = diffs;
// debugger;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove this debugger comment.

@TicaTac
Copy link
Contributor Author

TicaTac commented May 24, 2018

@justspamjustin
Thanks, Done !

@justspamjustin justspamjustin merged commit aa8dbfe into blitlabs:master May 29, 2018
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.

3 participants