luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
544 commits 6 branches 181 tags 6.7 MiB
Commit graph

165 commits

Author SHA1 Message Date
Rodrigo Fernandes
1bb5a0bbdd
Merge pull request #215 from rtfpessoa/fix-linenumbers-on-scroll 
Fix linenumbers on scroll
 2019-05-01 13:34:02 +01:00
Rodrigo Fernandes
4418f5f00a
fix: Line numbers when scrolling 2019-05-01 13:31:21 +01:00
Mohamed Akram
e4e0df62b9 Preserve tabs 2019-04-15 20:26:32 +04:00
Nick Brewer
9c30d10b97 Fix trailing comma lint issue. 2019-01-31 18:18:24 -06:00
Nick Brewer
b43cc1ae91 Add configuration option to disable the render of templates. 
No template would render if the diff shows no difference in its comparison.
 2019-01-31 17:58:48 -06:00
Rodrigo Fernandes
65f24c5674
Merge pull request #187 from starpit/lodash.merge 
fix: trim lodash dependence down to lodash.merge
 2019-01-04 23:30:03 +00:00
Nick Mitchell
cc3083710e fix: trim lodash dependence down to lodash.merge 
Fixes #186
 2019-01-02 20:45:28 -05:00
Rodrigo Fernandes
7fbc8c238a
Improve line-height 2018-11-18 15:38:46 +00:00
stockmind
a222ff624c Target and style blank lines in side-by-side view 2018-11-14 22:18:39 +01:00
wesssel
ffbb530f81 load merge from lodash instead of whole module 2018-01-10 18:07:46 +09:00
Rodrigo Fernandes
16d63a92ab
Fix diff generation for long lines 2017-10-16 23:44:00 +01:00
romellem
5215321466 Fixes regex for timestamps to when behind GMT 
Currently, a timezone that ends in say '+0200' will get stripped, but a
timezone _behind_ GMT will not (so a timezone in the United States of
say, '-0400' will **not** get stripped.

This regex change fixes that.
 2017-10-09 09:34:55 -05:00
Rodrigo Fernandes
267748f967
Fix escaping in header lines 2017-03-18 00:11:55 +00:00
Rodrigo Fernandes
523f2109fc
Expose synchronised scroll in the UI helper api 2017-01-15 18:36:12 +00:00
Rodrigo Fernandes
22b9783d07
Update hljs to 9.8.0 2016-12-11 15:22:08 +00:00
Rodrigo Fernandes
0f2d650436
Parse binary patch diffs 2016-12-01 16:39:01 +00:00
Paulo Bu
a481fad7ca Remove timestamps from filenames in unified diffs 2016-10-25 13:48:00 +02:00
Rodrigo Fernandes
f3cadb9667
Allow uncompiled templates 2016-10-15 13:31:02 +01:00
Rodrigo Fernandes
2aaae31cc2 Initial template override support 2016-10-15 13:00:31 +01:00
Rodrigo Fernandes
2a18c91e70
Add another way to recognize binary file names 2016-10-08 15:55:30 +01:00
Rodrigo Fernandes
d3b053cae0
Force inputFormat on ui helper since it is always json 2016-09-18 22:06:29 +01:00
Rodrigo Fernandes
7290650a08
Fix line height not matching between right and left side 2016-09-10 14:57:53 +01:00
Rodrigo Fernandes
f43e03e785
Fix docs offline and fix css typo 2016-09-10 13:30:51 +01:00
Rodrigo Fernandes
6a47f8f3a5
Fix convert &nbps; to proper white spaces with white-space wrap 2016-09-05 22:34:18 +01:00
Rodrigo Fernandes
ed8d33930d
Fix git diff with renames and hunk headers 
When we have the file names we consider that the file is already past
the hunk header (@@) and since the renames were setting the names
before the diff was confused.
To fix this I kind of hacked a solution that only uses the rename
file paths if there is no hunk header comming.
We need to find a better way to decide when to start new hunk, finish
files etc
 2016-09-02 17:45:35 +01:00
Rodrigo Fernandes
e9e3d928ea
Only log failed hunk header parse if line starts with @@ 2016-07-12 18:44:09 +01:00
Rodrigo Fernandes
9bbc87ae89
Fix parsing of binary files 2016-07-12 16:18:42 +01:00
Rodrigo Fernandes
2f53bf777e
Use ESLint instead of JSCS 2016-07-12 13:47:29 +01:00
Rodrigo Fernandes
f2858f6c45 Fix parsing in cases where body lines can be confused with header lines 2016-06-28 22:15:03 +01:00
Rodrigo Fernandes
7c79cc32db Fix parsing body lines starting with --- and +++ 2016-06-27 21:13:25 +01:00
Rodrigo Fernandes
ae39ce97b6
Improve css prefixes 2016-05-26 16:33:27 +01:00
Rafael Cortês
90c9d08744
Add synchronised horizontal scroll 2016-05-21 23:24:52 +01:00
Rodrigo Fernandes
fa9bdebe4c
Update tests for new design improvements 2016-05-21 02:09:16 +01:00
Rodrigo Fernandes
f32c6c9f67
Migrate Side-by-Side diffs to hogan.js 2016-05-21 00:39:49 +01:00
Rodrigo Fernandes
5cba4efde9
Extract file path from diff wrapper 2016-05-20 23:59:37 +01:00
Rodrigo Fernandes
7c48e86a99 Add icons and tags to files indicating the type of change 2016-05-20 23:41:37 +01:00
Rodrigo Fernandes
024c37da67 Make file summary more appealing 2016-05-20 23:41:14 +01:00
Rodrigo Fernandes
ce90977163
Use operator assignement and remove redundant else 2016-05-20 23:29:11 +01:00
Rodrigo Fernandes
285c3fefc5
Improve rename paths 
* Identify smallest different sub path of the changed files paths and
highlight the changed part
 2016-05-20 23:17:03 +01:00
Rodrigo Fernandes
5cac9fd99f
Improve diff removed changed line background color 2016-05-19 18:11:54 +01:00
Rodrigo Fernandes
978e54ab64
Extract highlight.js internal api code to its own file 2016-05-14 11:30:34 +01:00
Rodrigo Fernandes
93721e7e98
Add hljs class manually 2016-05-09 18:21:50 +01:00
Rodrigo Fernandes
73999bb782
Keep one state for old and another for the new diff 2016-05-09 11:15:57 +01:00
Rodrigo Fernandes
719b1cde71
Fix class names on highlighted elements 2016-05-09 10:50:46 +01:00
Rodrigo Fernandes
affd71eca0
Fix highlight for multiline elements 
* Now highlight should be perfect except for cases where the diff
context is not enough to understant what is the code
 2016-05-09 00:08:05 +01:00
Rodrigo Fernandes
1e242ded9a
Improve fonts and font sizes 2016-05-07 15:15:29 +01:00
Rodrigo Fernandes
aa2382436e
Format CSS with 2 spaces 2016-05-07 15:14:05 +01:00
Rodrigo Fernandes
3cba36f959
Fix tests in node 0.12 2016-05-06 23:11:00 +01:00
Rodrigo Fernandes
cb145eddf6
Add support for parsing unified diffs 
* Refactor code to separate parser parts
* Add test for unified example
 2016-05-06 23:02:05 +01:00
Ivan Vorontsov
8c50a590b0 Quality gate fixes, part 2 2016-05-01 22:33:55 +03:00
Ivan Vorontsov
12b2ee9356 Test fixes. 2016-05-01 22:26:10 +03:00
Ivan Vorontsov
619b43ffa4 Implemented separated column selection through javascript clipboard hook. 2016-05-01 22:02:11 +03:00
Rodrigo Fernandes
f08137f8ba
Improve branch coverage 2016-04-25 19:30:38 +01:00
Rodrigo Fernandes
95322eb87c
Update jscs, jquery and highlight.js 2016-04-25 18:25:39 +01:00
Rodrigo Fernandes
2463cb0270
Add more tests to hogan templates 2016-04-25 17:53:54 +01:00
Rodrigo Fernandes
e35b80a478
Add more tests for line by line diff generation 2016-04-25 16:51:27 +01:00
Rodrigo Fernandes
3fd5eb86bb
Fix parsing of line numbers 2016-04-25 16:20:40 +01:00
Rodrigo Fernandes
50bbca6cc2
Fix build on webpack 2016-04-25 15:45:47 +01:00
Rodrigo Fernandes
9d342669a1 Merge pull request #69 from rtfpessoa/hogan.js 
Use Hogan.js for templating engine
 2016-04-25 13:36:44 +01:00
Rodrigo Fernandes
374265354e
Add more tests and fix index parsing 2016-04-25 12:17:04 +01:00
Rodrigo Fernandes
b1f1ba6008
Use pre-compiled templates in node 2016-04-16 17:46:25 +01:00
Rodrigo Fernandes
05a09ae2a7 Fix browserTemplates global usage in node 2016-04-16 12:07:23 +01:00
Rodrigo Fernandes
8c45320674 Fix wrong template path 2016-04-16 12:07:23 +01:00
Rodrigo Fernandes
8237c8da28 Use hogan.js as templating engine 2016-04-16 12:07:23 +01:00
Wolfgang Illmeyer
ee494b88e5 Cap line matching comparisons 2016-04-14 17:28:06 +02:00
Rodrigo Fernandes
3929ca28fc Fix /dev/null filename on html generation 2016-03-21 00:23:50 +00:00
Rodrigo Fernandes
465dde689a Fix repeated variable name in same scope (thanks Codacy) 2016-02-24 00:13:43 +00:00
Rodrigo Fernandes
9205e5e0a1 Fix filename parsing on filenames with tabs 
* Why would someone create files with tabs?
 2016-02-23 21:40:56 +00:00
Rodrigo Fernandes
e44b2a2885 Fix filename parsing with special characters and prefixes 
* Add support for diffs with prefixes through configuration
* Fix parsing of filenames with special chars
 2016-02-23 18:21:34 +00:00
Rodrigo Fernandes
75c4c2da46 Clean files summary and diff headers and line numbers 2016-02-21 16:46:07 +00:00
Rodrigo Fernandes
d6a03668c4 Fix line wrapping 2016-02-21 16:40:22 +00:00
Rodrigo Fernandes
adc4b629c1 Prepare for nunjucks release 2016-02-21 14:45:50 +00:00
Rodrigo Fernandes
7638fbba52 Fix nunjucks in the browser 2016-02-21 11:16:36 +00:00
Paulo Bu
e15cde2d6f Adds test for whitespaces and indentation and adds template for the wrapper 2016-02-21 11:05:53 +00:00
Paulo Bu
da2cd63a75 Attempt to use nunjuck templates in Line By Line 2016-02-21 11:05:53 +00:00
Rodrigo Fernandes
7acee5186b Add url hashtag for file summary state override 2016-02-12 23:11:59 +00:00
Rodrigo Fernandes
71de8ea7f1 Gather file languages from the html 2016-02-09 21:26:22 +00:00
Rodrigo Fernandes
59914f1a10 Merge pull request #58 from rtfpessoa/fix-file-summary-switch 
Fix file summary switch
 2016-02-07 14:27:48 +00:00
Rodrigo Fernandes
43666f655a Fix file summary switch 
Introduce diff2html-ui to perform any ui anymations or dynamic changes
like hightlight or animations.
 2016-02-07 14:19:23 +00:00
Rodrigo Fernandes
269a6268c4 Fix parsing on Windows 
Replace windows EOL by Unix EOL
 2016-02-06 18:50:47 +00:00
Rafael Cortês
f7bc1552e5 Fix line count when EOF is added to file 
Removes '\\ No newline at end of file' information from the diff lines.
The test case is based on Bitbucket's diff attached to issue #49.
 2016-01-16 21:53:54 +00:00
Rodrigo Fernandes
cc6ed43f25 Remove extra white space 2016-01-10 18:49:16 +00:00
Paulo Bu
2cdb67d938 Refactors HTML code into their own methods in SideBySidePrinter 2016-01-10 18:16:43 +01:00
Paulo Bu
a37176cc26 Refactors HTML code into their own methods 2015-12-27 12:29:58 +01:00
Rodrigo Fernandes
f3d2946aa4 Force JSCS style 2015-12-23 19:34:39 +00:00
Paulo Bu
7f08de9c67 Fixes prefix bug on side by side diff 2015-12-23 15:34:44 +01:00
Paulo Bu
c5f54d29f8 Passes config in the SideBySide constructor and uses it from within the class 2015-12-21 15:26:08 +01:00
Paulo Bu
a4cf385a7d Makes SideBySidePrinter more object oriented 2015-12-21 15:26:02 +01:00
Rodrigo Fernandes
7fa8292da1 Fix some more CSS and JS style issues 2015-12-20 23:38:16 +00:00
Rodrigo Fernandes
8d86a15d69 Clean code and force code style 
Since more people are contributing to the code Codacy will help
keep it consistent and easy to maintain, by suggesting improvements
 2015-12-20 22:55:09 +00:00
Paulo Bu
068f30c2ce Renames and correctly declares variable 'that' instead of 'self' 2015-12-20 23:42:37 +01:00
Paulo Bu
e3f572c075 Passes config in the LineByLine constructor and uses it from within the class 2015-12-20 15:56:53 +01:00
Paulo Bu
4a06df6039 Makes LineByLine more object oriented 2015-12-20 15:51:56 +01:00
Wolfgang Illmeyer
e41ee3eae8 Fix change grouping algorithm 2015-12-19 21:52:34 +01:00
Wolfgang Illmeyer
94516c835b make matching configurable 2015-12-09 23:17:45 +01:00
Wolfgang Illmeyer
8c059d30da Add changetype constant, fix css color for changes 2015-12-06 22:45:58 +01:00
Wolfgang Illmeyer
7335c3bab3 Enhancements for highlighting 
1. Fixed a bug that prevented highlighting when more lines were deleted
from a replacement block than added

2. Added similarity search feature to match similar lines for
highlighting.

3. Highlighting: Support for matching "ins" and "del" markers to allow
for a "change" marker

4. Bugfix: All lines are now split into prefix and content spans
 2015-11-27 11:39:08 +01:00
Rodrigo Fernandes
54b39158f5 fix changes summary on files headers 
* since the alignment of the changes the file headers lost the style due to css changes
* update diff dependency and add dev dependencies
 2015-10-31 21:55:15 +00:00
Mikko Rantanen
26d349b736 Align the file summary 
Use <table> element to lay out the file summary. The summary is tabular
data anyway so the use of <table> should be justified. First column
contains lines added, justified to right and the second column contains
lines removed, justified to the left. The last column has the file name.

Fixes #27
 2015-10-28 19:43:06 +02:00
Paulo Bu
c1ea2cb3b2 Extracts variables out of a loop 2015-10-20 10:55:22 +02:00