Other Fix for #310 #333
Merged
Other Fix for #310 #333
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix for rowanj#310. ``` ... message = "TypeError: 'undefined' is not an object (evaluating 'ns[ n[i] ].rows.push')"; sourceURL = "file:///Applications/GitX.app/Contents/Resources/html/lib/diffHighlighter.js"; ``` I turns out that the `inlinediff.diff()` method had issues caused by the use of Objects as HashMap. That's why @dgreensp added a fix using `Object.prototype.hasOwnProperty` (see rowanj#320). However this solution still fails when the key becomes `"__proto__"`, for some reason. A simpler, saver and yet more efficient fix to the root issue is to just prefix the keys. e.g. `'"' + key`.
rowanj
added a commit
that referenced
this pull request
Jul 27, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix for #310.
I turns out that the
inlinediff.diff()method had issues caused by the use of Objects as HashMap. That's why @dgreensp added a fix usingObject.prototype.hasOwnProperty(see #320). However this solution still fails when the key becomes__proto__, for some reason.A simpler, saver and yet more efficient fix to the root issue is to just prefix the keys. e.g.
'"' + key.