Nextrek - Nextrek - Diff 794 vs 795 on /legal-map/js/diff/jquery.pretty-text-diff-1.0.4.js - Nextrek - Powered by XP-Dev.com

Subversion Repository

Public Repository

Nextrek

URLs

Copy to Clipboard

Explore

Commits

Diff Revisions 794 vs 795 for /legal-map/js/diff/jquery.pretty-text-diff-1.0.4.js

		@@ -26,8 +26,8 @@
26	26		return this.each(function() {
27	27		var changed, diff_as_html, diffs, original;
28	28		if (settings.originalContent && settings.changedContent) {
29		-	original = $('<div />').html(settings.originalContent).text();
30		-	changed = $('<div />').html(settings.changedContent).text();
	29	+	original = settings.originalContent;//$('<div />').html(settings.originalContent).text();
	30	+	changed = settings.changedContent;//$('<div />').html(settings.changedContent).text();
31	31		} else {
32	32		original = $(settings.originalContainer, this).text();
33	33		changed = $(settings.changedContainer, this).text();
		@@ -42,7 +42,13 @@
42	42		diff_as_html = $.map(diffs, function(diff) {
43	43		return $.fn.prettyTextDiff.createHTML(diff);
44	44		});
45		-	$(settings.diffContainer, this).html(diff_as_html.join(''));
	45	+	var encodedStr = diff_as_html.join('');
	46	+	//newdom = $("<div/>").html(encodedStr).text();
	47	+	encodedStr = encodedStr.replace(/\<br\>\<br\>/g, '<br>');
	48	+	encodedStr = encodedStr.replace(/\/p\><br\>/g, '/p>');
	49	+	//encodedStr = encodedStr.replace(/[<]/g,'<').replace(/[>]/g,'>');
	50	+	//var newdom = $("<div/>").html(encodedStr).text();
	51	+	$(settings.diffContainer, this).html(encodedStr);
46	52		return this;
47	53		});
48	54		}
		@@ -62,14 +68,15 @@
62	68		pattern_gt = />/g;
63	69		pattern_para = /\n/g;
64	70		operation = diff[0], data = diff[1];
65		-	text = data.replace(pattern_amp, '&').replace(pattern_lt, '<').replace(pattern_gt, '>').replace(pattern_para, '<br>');
	71	+	//text = data.replace(pattern_amp, '&').replace(pattern_lt, '<').replace(pattern_gt, '>').replace(pattern_para, '<br>');
	72	+	text = data.replace(pattern_para, '<br>');
66	73		switch (operation) {
67	74		case DIFF_INSERT:
68	75		return '<ins>' + text + '</ins>';
69	76		case DIFF_DELETE:
70	77		return '<del>' + text + '</del>';
71	78		case DIFF_EQUAL:
72		-	return '<span>' + text + '</span>';
	79	+	return text;
73	80		}
74	81		};
75	82

View View this file contents

History View the full history

Feeds

Commits for /legal-map/js/diff/jquery.pretty-text-diff-1.0.4.js