forked from chrisboulton/php-diff
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Html Unified renderer causes following error when rendering skipped lines: Element div not allowed as child of element span in this context.
- Loading branch information
Showing
4 changed files
with
4 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,6 +47,7 @@ pre { | |
|
||
.Differences .Skipped { | ||
background: #F7F7F7; | ||
display: block; | ||
} | ||
|
||
/* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
<span class="Differences DifferencesUnified"><span class="ChangeEqual"><span><html></span><br><span> <head></span><br><span> <meta http-equiv="Content-type" content="text/html; charset=utf-8"/></span><br></span><span class="ChangeReplace"><span class="Left"> <title>Hello <del>World</del>!</title></span><br><span class="Right"> <title>Hello <ins>You</ins>!</title></span><br></span><span class="ChangeEqual"><span> </head></span><br><span> <body></span><br><span> <h1>This is demo content to show features of the php-diff package.</h1></span><br></span><span class="ChangeDelete"><span class="Left"><del> <h2>This line is removed from version2.</h2></del></span><br></span><span class="ChangeEqual"><span> <h2>This line is the same for both versions.</h2></span><br></span><span class="ChangeReplace"><span class="Left"> <h2><del>this line has inline</del> differences between both versions.</h2></span><br><span class="Right"> <h2><ins>This line has</ins> differences between both versions.</h2></span><br></span><span class="ChangeEqual"><span> <h2>This line is the same for both versions.</h2></span><br></span><span class="ChangeReplace"><span class="Left"> <h2>This line also has <del>inl</del>ine differences between both versions.</h2></span><br><span class="Right"> <h2>This line also has <ins>InL</ins>ine differences between both versions.</h2></span><br></span><span class="ChangeEqual"><span> <h2>This line is the same for both versions.</h2></span><br></span><span class="ChangeInsert"><span class="Right"><ins> <h2>This line is added to version2.</h2></ins></span><br></span><span class="ChangeEqual"><span></span><br><span> <p></span><br><span> It's also compatible with multibyte characters (like Chinese and emoji) as shown below:</span><br></span><span class="ChangeReplace"><span class="Left"> 另外我覺得那個評<del>價</del>的白色櫃子有點沒有必要欸。外觀我就不說了 ,怎麼連空間都那麼狹隘。不過倒是從這個地方看出所謂的“改革”</span><br><span class="Left"> Do you know what "<del>金槍魚罐頭</del>" means in Chinese?</span><br><span class="Left"> <del>🍏🍎</del>🙂</span><br><span class="Right"> 另外我覺得那個評<ins>鑑</ins>的白色櫃子有點沒有必要欸。外觀我就不說了 ,怎麼連空間都那麼狹隘。不過倒是從這個地方看出所謂的“改革”</span><br><span class="Right"> Do you know what "<ins>魚の缶詰</ins>" means in Chinese?</span><br><span class="Right"> <ins>🍎🍏</ins>🙂</span><br></span><span class="ChangeEqual"><span> </p></span><br><span></span><br><span> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></span><br></span><div class="Skipped" title="Equal lines collapsed!">…</div><span class="ChangeEqual"><span> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></span><br><span> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></span><br><span> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></span><br></span><span class="ChangeReplace"><span class="Left"><del> </del><h2>This line also has inline differences between both versions. It's the whitespace in front.</h2></span><br><span class="Right"><ins> </ins><h2>This line also has inline differences between both versions. It's the whitespace in front.</h2></span><br></span><span class="ChangeEqual"><span> <h2>This line is the same for both versions.</h2></span><br></span><span class="ChangeReplace"><span class="Left"> <h2>This line also has inline differences between both versions<del>.</del></h2></span><br><span class="Right"> <h2>This line also has inline differences between both versions<ins>!</ins></h2></span><br></span><span class="ChangeEqual"><span> </body></span><br><span></html></span><br><span></span><br></span></span> | ||
<span class="Differences DifferencesUnified"><span class="ChangeEqual"><span><html></span><br><span> <head></span><br><span> <meta http-equiv="Content-type" content="text/html; charset=utf-8"/></span><br></span><span class="ChangeReplace"><span class="Left"> <title>Hello <del>World</del>!</title></span><br><span class="Right"> <title>Hello <ins>You</ins>!</title></span><br></span><span class="ChangeEqual"><span> </head></span><br><span> <body></span><br><span> <h1>This is demo content to show features of the php-diff package.</h1></span><br></span><span class="ChangeDelete"><span class="Left"><del> <h2>This line is removed from version2.</h2></del></span><br></span><span class="ChangeEqual"><span> <h2>This line is the same for both versions.</h2></span><br></span><span class="ChangeReplace"><span class="Left"> <h2><del>this line has inline</del> differences between both versions.</h2></span><br><span class="Right"> <h2><ins>This line has</ins> differences between both versions.</h2></span><br></span><span class="ChangeEqual"><span> <h2>This line is the same for both versions.</h2></span><br></span><span class="ChangeReplace"><span class="Left"> <h2>This line also has <del>inl</del>ine differences between both versions.</h2></span><br><span class="Right"> <h2>This line also has <ins>InL</ins>ine differences between both versions.</h2></span><br></span><span class="ChangeEqual"><span> <h2>This line is the same for both versions.</h2></span><br></span><span class="ChangeInsert"><span class="Right"><ins> <h2>This line is added to version2.</h2></ins></span><br></span><span class="ChangeEqual"><span></span><br><span> <p></span><br><span> It's also compatible with multibyte characters (like Chinese and emoji) as shown below:</span><br></span><span class="ChangeReplace"><span class="Left"> 另外我覺得那個評<del>價</del>的白色櫃子有點沒有必要欸。外觀我就不說了 ,怎麼連空間都那麼狹隘。不過倒是從這個地方看出所謂的“改革”</span><br><span class="Left"> Do you know what "<del>金槍魚罐頭</del>" means in Chinese?</span><br><span class="Left"> <del>🍏🍎</del>🙂</span><br><span class="Right"> 另外我覺得那個評<ins>鑑</ins>的白色櫃子有點沒有必要欸。外觀我就不說了 ,怎麼連空間都那麼狹隘。不過倒是從這個地方看出所謂的“改革”</span><br><span class="Right"> Do you know what "<ins>魚の缶詰</ins>" means in Chinese?</span><br><span class="Right"> <ins>🍎🍏</ins>🙂</span><br></span><span class="ChangeEqual"><span> </p></span><br><span></span><br><span> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></span><br></span><span class="Skipped" title="Equal lines collapsed!">…</span><span class="ChangeEqual"><span> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></span><br><span> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></span><br><span> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></span><br></span><span class="ChangeReplace"><span class="Left"><del> </del><h2>This line also has inline differences between both versions. It's the whitespace in front.</h2></span><br><span class="Right"><ins> </ins><h2>This line also has inline differences between both versions. It's the whitespace in front.</h2></span><br></span><span class="ChangeEqual"><span> <h2>This line is the same for both versions.</h2></span><br></span><span class="ChangeReplace"><span class="Left"> <h2>This line also has inline differences between both versions<del>.</del></h2></span><br><span class="Right"> <h2>This line also has inline differences between both versions<ins>!</ins></h2></span><br></span><span class="ChangeEqual"><span> </body></span><br><span></html></span><br><span></span><br></span></span> |