Commit graph

197 commits

Author SHA1 Message Date
Rodrigo Fernandes
bdd88f4b90
fix: Add missing padding to side by side line numbers 2020-02-09 16:21:06 +00:00
Rodrigo Fernandes
ee58e2d700
feature: Implement smart selection in CSS 2020-02-09 16:08:58 +00:00
Rodrigo Fernandes
076e14400b
clean: Remove as type casts and use runtime typechecks with fallback when possible 2020-01-25 23:49:53 +00:00
Rodrigo Fernandes
fe8365bcc1
clean: Replace enums with string or type and object 2020-01-25 23:49:17 +00:00
Rodrigo Fernandes
42c8e26ff4
clean: Add typings for highlight.js languages 2020-01-12 02:24:16 +00:00
Josh Goldberg
eca5b3cfd8 Point of comparison for export = hljs types 2020-01-11 00:14:41 -05:00
Rodrigo Fernandes
db48e96dca
Merge pull request #274 from rtfpessoa/improve-highlightjs-types
clean: Improve highlight.js types
2020-01-10 22:49:38 +00:00
Rodrigo Fernandes
8b5111f8de
clean: Improve diff2html-ui APIs for standalone usage 2020-01-08 22:40:46 +00:00
Rodrigo Fernandes
3c3f528815
clean: Improve highlight.js types 2020-01-05 23:46:32 +00:00
Rodrigo Fernandes
dc9c866041
clean: Improve build configurations 2020-01-01 19:51:36 +00:00
Rodrigo Fernandes
c3c5f60c0d
test: Use Jest snapshots 2019-12-22 19:52:51 +00:00
Rodrigo Fernandes
4a159277a2
clean: Prepare for pre release 2019-12-22 18:47:20 +00:00
Rodrigo Fernandes
8f1208eb01
refactor: Unify line-by-line and side-by-side 2019-12-22 18:35:05 +00:00
Rodrigo Fernandes
5c35de28eb
refactor: Separate matching in side-by-side algorithm 2019-12-22 18:04:52 +00:00
Rodrigo Fernandes
d8e0a99070
refactor: Separate matching in line-by-line algorithm 2019-12-22 18:01:01 +00:00
Rodrigo Fernandes
a25d06a8d7
refactor: Extract matching algorithm in line-by-line diff 2019-12-22 18:00:59 +00:00
Rodrigo Fernandes
0f08c85938
refactor: Unify escaping 2019-12-22 18:00:57 +00:00
Rodrigo Fernandes
f8f5c10c57
refactor: Generators 1 2019-12-22 18:00:55 +00:00
Rodrigo Fernandes
ef1ccb093e
refactor: Use lambda functions for map instead of anonymous functions 2019-12-22 18:00:53 +00:00
Rodrigo Fernandes
7b1727dc74
refactor: Refactor build to use webpack 2019-12-22 18:00:52 +00:00
Rodrigo Fernandes
4200bd7a3b
refactor: Move types and use enums 2019-12-22 18:00:50 +00:00
Rodrigo Fernandes
f72ee2ea46
wip: tweaks to website 2019-12-22 18:00:48 +00:00
Rodrigo Fernandes
4f607633dd
wip: Code and Tests working 2019-12-22 18:00:45 +00:00
Rodrigo Fernandes
a8b9b2b49a
refactor: Initial migration to typescript 2019-12-22 17:58:43 +00:00
Rodrigo Fernandes
a047423f4e
fix: Side by side line spacing
Fixes https://github.com/rtfpessoa/diff2html/issues/251
2019-12-22 17:50:22 +00:00
Rodrigo Fernandes
a5c4b2d219
bump: Bundle typings 2019-10-05 11:18:17 +01:00
Rodrigo Fernandes
53958687a6
fix: Bring char by char option back 2019-10-05 10:47:43 +01:00
Eugene Marcotte
f68f930dd2 Expose oldName and newName to file list templates 2019-07-09 14:28:52 -04:00
Koki Oyatsu
5bf0575b46 Replace space to   for HTML Rendering.
Reason:
Some javascript frameworks(ex. vue.js) manipulate HTML tags when drawing.

At that time, if there is a space-only DOM element, the space in the DOM
element is deleted.

Before:
`` `
<span> </span>
`` `

After (space deleted)
`` `
<span></span>
`` `

In order to avoid this, it has been modified to render with &nbsp; only when there is no diff.
2019-07-07 02:39:50 +09:00
Rodrigo Fernandes
d131860324
fix: Update typescript typings and default configuration options 2019-07-03 20:42:33 +01:00
Rodrigo Fernandes
3c06b401b9
feature: Add maxLineSizeInBlockForComparison to avoid OOM
Fixes #220
2019-06-14 17:10:31 +01:00
Rodrigo Fernandes
07f94aeb9e
fix: Remove lodash.merge for merge 2019-05-08 23:42:42 +01:00
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