Skip to content

adicionando opção para manter a formatação do HTML #13

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.

Sign up for GitHub

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

Closed
erodrigues-dev wants to merge 3 commits into from
Closed

adicionando opção para manter a formatação do HTML #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d60db8a
adicionando opção para manter a formatação do HTML
erodrigues-dev Nov 6, 2015
e321c51
incrmentando versão
erodrigues-mtt Jan 30, 2017
cf18a13
corrigindo numero da versão nos arquivos
erodrigues-mtt Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vscode
18 changes: 0 additions & 18 deletions Cakefile
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions jquery.pretty-text-diff.coffee
View file
Open in desktop

This file was deleted.

26 changes: 16 additions & 10 deletions jquery.pretty-text-diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Generated by CoffeeScript 1.9.2

/*
@preserve jQuery.PrettyTextDiff 1.0.4
See https://github.com/arnab/jQuery.PrettyTextDiff/
*/
@preserve jQuery.PrettyTextDiff 2.0.0
Project forked https://github.com/arnab/jQuery.PrettyTextDiff/
*/

(function() {
var $;
var $,
settings_global;

$ = jQuery;

Expand All @@ -18,19 +18,24 @@ See https://github.com/arnab/jQuery.PrettyTextDiff/
changedContainer: ".changed",
diffContainer: ".diff",
cleanup: true,
isHtml: false,
debug: false
};
settings = $.extend(settings, options);
settings_global = settings;
$.fn.prettyTextDiff.debug("Options: ", settings, settings);
dmp = new diff_match_patch();
return this.each(function() {
var changed, diff_as_html, diffs, original;
if (settings.originalContent && settings.changedContent) {
original = $('<div />').html(settings.originalContent).text();
changed = $('<div />').html(settings.changedContent).text();
original = settings.isHtml ? settings.originalContent : $('<div />').html(settings.originalContent).text();
changed = settings.isHtml ? settings.changedContent :$('<div />').html(settings.changedContent).text();
} else {
original = $(settings.originalContainer, this).text();
changed = $(settings.changedContainer, this).text();
var $originalContainer = $(settings.originalContainer, this);
var $changedContainer = $(settings.changedContainer, this);

original = settings.isHtml ? $originalContainer.html() : $originalContainer.text();
changed = settings.isHtml ? $changedContainer.html() : $changedContainer.text();
}
$.fn.prettyTextDiff.debug("Original text found: ", original, settings);
$.fn.prettyTextDiff.debug("Changed text found: ", changed, settings);
Expand All @@ -42,6 +47,7 @@ See https://github.com/arnab/jQuery.PrettyTextDiff/
diff_as_html = $.map(diffs, function(diff) {
return $.fn.prettyTextDiff.createHTML(diff);
});

$(settings.diffContainer, this).html(diff_as_html.join(''));
return this;
});
Expand All @@ -62,7 +68,7 @@ See https://github.com/arnab/jQuery.PrettyTextDiff/
pattern_gt = />/g;
pattern_para = /\n/g;
operation = diff[0], data = diff[1];
text = data.replace(pattern_amp, '&amp;').replace(pattern_lt, '&lt;').replace(pattern_gt, '&gt;').replace(pattern_para, '<br>');
text = settings_global.isHtml ? data : data.replace(pattern_amp, '&amp;').replace(pattern_lt, '&lt;').replace(pattern_gt, '&gt;').replace(pattern_para, '<br>');
switch (operation) {
case DIFF_INSERT:
return '<ins>' + text + '</ins>';
Expand Down
8 changes: 4 additions & 4 deletions jquery.pretty-text-diff.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-prettytextdiff",
"version": "1.0.4",
"version": "2.0.0",
"description": "A jQuery plugin to diff text painlessly. Uses Google's diff_match_patch library underneath.",
"main": "jquery.pretty-text-diff.js",
"repository": {
Expand Down