From 82a2096ef24b49c82f38356df382dce68cd342d7 Mon Sep 17 00:00:00 2001 From: Nikolay Soms Date: Thu, 2 Mar 2017 19:47:08 +0400 Subject: [PATCH 1/8] Create bower.json --- bower.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..8ab0980 --- /dev/null +++ b/bower.json @@ -0,0 +1,24 @@ +{ + "name": "jsdifflib", + "authors": [ + "Chas Emerick " + ], + "description": "jsdifflib - A Javascript visual diff tool & library", + "main": [ + "difflib.js", + "diffview.js", + "diffview.css" + ], + "license": "BSD", + "homepage": "https://github.com/cemerick/jsdifflib", + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + } +} From c611df07fa7142fdcfdb18dd101c306d2cec00ef Mon Sep 17 00:00:00 2001 From: Nikolay Soms Date: Thu, 2 Mar 2017 19:53:28 +0400 Subject: [PATCH 2/8] Create jsdifflib.scss --- jsdifflib.scss | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 jsdifflib.scss diff --git a/jsdifflib.scss b/jsdifflib.scss new file mode 100644 index 0000000..63ed931 --- /dev/null +++ b/jsdifflib.scss @@ -0,0 +1,95 @@ +/** +This is part of jsdifflib v1.0. + +Copyright 2007 - 2011 Chas Emerick . All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are +permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, this list + of conditions and the following disclaimer in the documentation and/or other materials + provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY Chas Emerick ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Chas Emerick OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those of the +authors and should not be interpreted as representing official policies, either expressed +or implied, of Chas Emerick. +*/ + +table.diff { + border-collapse: collapse; + border: 1px solid darkgray; + white-space: pre-wrap; + + tbody { + font-family: Courier, monospace; + + th { + font-family: verdana, arial, 'Bitstream Vera Sans', helvetica, sans-serif; + background: #EED; + font-size: 11px; + font-weight: normal; + border: 1px solid #BBC; + color: #886; + padding: .3em .5em .1em 2em; + text-align: right; + vertical-align: top + } + + td { + padding: 0px .4em; + padding-top: .4em; + vertical-align: top; + } + } + + thead { + border-bottom: 1px solid #BBC; + background: #EFEFEF; + font-family: Verdana; + + th.texttitle { + text-align: left; + } + } + + .empty { + background-color: #DDD; + + } + .replace { + background-color: #FD8 + + } + .delete { + background-color: #E99; + + } + .skip { + background-color: #EFEFEF; + border: 1px solid #AAA; + border-right: 1px solid #BBC; + + } + .insert { + background-color: #9E9; + + } + th.author { + text-align: right; + border-top: 1px solid #BBC; + background: #EFEFEF; + } +} From 81ea218bb8fdb4e684be1b55e240b96dd5dd053a Mon Sep 17 00:00:00 2001 From: Nikolay Soms Date: Thu, 2 Mar 2017 19:56:50 +0400 Subject: [PATCH 3/8] Update bower.json --- bower.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 8ab0980..78e4621 100644 --- a/bower.json +++ b/bower.json @@ -7,7 +7,8 @@ "main": [ "difflib.js", "diffview.js", - "diffview.css" + "diffview.css", + "jsdifflib.scss" ], "license": "BSD", "homepage": "https://github.com/cemerick/jsdifflib", From 8f82228715be58cd438ba9432a61b253c62eb679 Mon Sep 17 00:00:00 2001 From: Nick Soms Date: Thu, 9 Nov 2017 19:51:50 +0300 Subject: [PATCH 4/8] added package.json --- package.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 0000000..f46c812 --- /dev/null +++ b/package.json @@ -0,0 +1,26 @@ +{ + "name": "ns3-jsdifflib", + "version": "1.1.4", + "description": "A diff library to compare text differences between two texts.", + "main": "index.js", + "directories": { + }, + "dependencies": {}, + "devDependencies": {}, + "scripts": { + }, + "private": true, + "repository": { + "type": "git", + "url": "git+https://github.com/nsoms/jsdifflib.git" + }, + "keywords": [ + "jsdifflib", + "diffchecker", + "text", + "difference" + ], + "author": "Chas Emerick", + "license": "BSD", + "homepage": "https://github.com/cemerick/jsdifflib#readme" +} From bdfc7f468dfee8159b338b72cbbb332022397c3e Mon Sep 17 00:00:00 2001 From: Nick Soms Date: Thu, 9 Nov 2017 19:56:11 +0300 Subject: [PATCH 5/8] added common export file --- difflib.js | 1 + diffview.js | 1 + index.js | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 index.js diff --git a/difflib.js b/difflib.js index 191fe45..781400d 100755 --- a/difflib.js +++ b/difflib.js @@ -411,3 +411,4 @@ var difflib = { } }; +module.exports = difflib; diff --git a/diffview.js b/diffview.js index 372753d..d2967fc 100644 --- a/diffview.js +++ b/diffview.js @@ -196,3 +196,4 @@ diffview = { } }; +module.exports = diffview; diff --git a/index.js b/index.js new file mode 100644 index 0000000..71cb8d8 --- /dev/null +++ b/index.js @@ -0,0 +1,8 @@ +var difflib = require('difflib.js'); +var diffview = require('diffview.js'); + +module.exports = { + difflib: difflib, + diffview: diffview +}; + From 5f465ea885d42ef91e6efb8cc3796a8d69d800e6 Mon Sep 17 00:00:00 2001 From: Nick Soms Date: Thu, 9 Nov 2017 20:04:55 +0300 Subject: [PATCH 6/8] fixed pathes --- index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 71cb8d8..cfa2ef7 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ -var difflib = require('difflib.js'); -var diffview = require('diffview.js'); +var difflib = require('./difflib.js'); +var diffview = require('./diffview.js'); module.exports = { difflib: difflib, From d4e27a512aa13f7c478f9cf2b28ba10e31dcedf5 Mon Sep 17 00:00:00 2001 From: Nikolay Soms Date: Thu, 26 Apr 2018 13:04:52 +0300 Subject: [PATCH 7/8] test commit --- a.a | 1 + 1 file changed, 1 insertion(+) create mode 100644 a.a diff --git a/a.a b/a.a new file mode 100644 index 0000000..e62415c --- /dev/null +++ b/a.a @@ -0,0 +1 @@ +qwe From 6d222559f9dc0c0a9bc4c1fa7e00c956e7ac5bdf Mon Sep 17 00:00:00 2001 From: Nikolay Soms Date: Thu, 26 Apr 2018 13:08:51 +0300 Subject: [PATCH 8/8] Delete a.a --- a.a | 1 - 1 file changed, 1 deletion(-) delete mode 100644 a.a diff --git a/a.a b/a.a deleted file mode 100644 index e62415c..0000000 --- a/a.a +++ /dev/null @@ -1 +0,0 @@ -qwe