mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Ignore old-style Mac newlines in conflict resolution

Browse source
This commit is contained in:
Dan Stillman 2012-01-03 23:25:17 -05:00
parent 88e1eca949
commit 9b133c40aa
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/xpcom/data/item.js
View file

@ -3747,9 +3747,9 @@ Zotero.Item.prototype.diff = function (item, includeMatches, ignoreFields) {
var thisNote = thisData.note; var thisNote = thisData.note;
var otherNote = otherData.note; var otherNote = otherData.note;
// Stop Windows newlines from triggering erroneous conflicts // Stop non-Unix newlines from triggering erroneous conflicts
thisNote = thisNote.replace(/\r\n/g, "\n"); thisNote = thisNote.replace(/(\r\n?/g, "\n");
otherNote = otherNote.replace(/\r\n/g, "\n"); otherNote = otherNote.replace(/\r\n?/g, "\n");
// Normalize multiple spaces (due to differences TinyMCE, Z.U.text2html(), // Normalize multiple spaces (due to differences TinyMCE, Z.U.text2html(),
// and the server) // and the server)