Skip to content

Commit

Permalink
Added web example.
Browse files Browse the repository at this point in the history
  • Loading branch information
airportyh committed Nov 5, 2013
1 parent f07f830 commit 16c90ca
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 10 deletions.
37 changes: 33 additions & 4 deletions README.md
Expand Up @@ -59,16 +59,16 @@ Note that some cases may omit a particular flag field. Comparison on the flag fi

## Examples

Using in Node
Basic example in Node

```js
require('colors')
var jsdiff = require('diff');

var one = 'beep boop'
var other = 'beep boob blah'
var one = 'beep boop';
var other = 'beep boob blah';

var diff = jsdiff.diffChars(one, other)
var diff = jsdiff.diffChars(one, other);

diff.forEach(function(part){
// green for additions, red for deletions
Expand All @@ -84,6 +84,35 @@ Running the above program should yield

<img src="images/node_example.png" alt="Node Example">

Basic example in a web page

```html
<pre id="display"></pre>
<script src="diff.js"></script>
<script>
var one = 'beep boop';
var other = 'beep boob blah';
var diff = JsDiff.diffChars(one, other);
diff.forEach(function(part){
// green for additions, red for deletions
// grey for common parts
var color = part.added ? 'green' :
part.removed ? 'red' : 'grey';
var span = document.createElement('span');
span.style.color = color;
span.appendChild(document
.createTextNode(part.value));
display.appendChild(span);
});
</script>
```

Open the above .html file in a browser and you should see

<img src="images/web_example.png" alt="Node Example">

* [Full online demo](http://kpdecker.github.com/jsdiff)

## License
Expand Down
8 changes: 4 additions & 4 deletions examples/node_example.js
@@ -1,10 +1,10 @@
require('colors')
var jsdiff = require('../diff');

var one = 'beep boop'
var other = 'beep boob blah'
var one = 'beep boop';
var other = 'beep boob blah';

var diff = jsdiff.diffChars(one, other)
var diff = jsdiff.diffChars(one, other);

diff.forEach(function(part){
// green for additions, red for deletions
Expand All @@ -14,4 +14,4 @@ diff.forEach(function(part){
process.stderr.write(part.value[color]);
});

console.log()
console.log();
1 change: 0 additions & 1 deletion examples/one.txt

This file was deleted.

1 change: 0 additions & 1 deletion examples/other.txt

This file was deleted.

20 changes: 20 additions & 0 deletions examples/web_example.html
@@ -0,0 +1,20 @@
<pre id="display"></pre>
<script src="../diff.js"></script>
<script>
var one = 'beep boop';
var other = 'beep boob blah';

var diff = JsDiff.diffChars(one, other);

diff.forEach(function(part){
// green for additions, red for deletions
// grey for common parts
var color = part.added ? 'green' :
part.removed ? 'red' : 'grey';
var span = document.createElement('span');
span.style.color = color;
span.appendChild(document
.createTextNode(part.value));
display.appendChild(span);
});
</script>
Binary file added images/web_example.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 16c90ca

Please sign in to comment.