hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added a tweak for MSID in code diff view

Browse Source
This commit is contained in:
hyung-hwan 2015-02-04 01:21:23 +00:00
parent ee8190d27d
commit 20bf9bd869
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
codepot/src/codepot/views/code_diff.php
View File

@ -307,6 +307,9 @@ if (FALSE) // don't want to delete code for the original diff view.
} }
else else
{ {
$http_user_agent = $_SERVER['HTTP_USER_AGENT'];
$is_msie = (preg_match('/MSIE/i',$http_user_agent) && !preg_match('/Opera/i',$http_user_agent));
print '<div style="width: 100%; overflow: hidden;" id="code_diff_mainarea_result_fullview">'; print '<div style="width: 100%; overflow: hidden;" id="code_diff_mainarea_result_fullview">';
if (empty($file['content'])) if (empty($file['content']))
@ -345,10 +348,12 @@ else
print "<span class='{$diffclass}'>"; print "<span class='{$diffclass}'>";
if ($diffclass == 'diffchanged') if ($diffclass == 'diffchanged')
print format_diff ($x['rev1line'], $x['rev2line'], 'diffchangedold'); $xline = format_diff ($x['rev1line'], $x['rev2line'], 'diffchangedold');
else else
print htmlspecialchars($x['rev1line']); $xline = htmlspecialchars($x['rev1line']);
if ($is_msie && $xline == '') $xline = '&nbsp;'
print $xline;
print "</span>\n"; print "</span>\n";
} }
else else
@ -392,10 +397,12 @@ else
print "<span class='{$diffclass}'>"; print "<span class='{$diffclass}'>";
if ($diffclass == 'diffchanged') if ($diffclass == 'diffchanged')
print format_diff ($x['rev2line'], $x['rev1line'], 'diffchangednew'); $xline = format_diff ($x['rev2line'], $x['rev1line'], 'diffchangednew');
else else
print htmlspecialchars($x['rev2line']); $xline = htmlspecialchars($x['rev2line']);
if ($is_msie && $xline == '') $xline = '&nbsp;'
print $xline;
print "</span>\n"; print "</span>\n";
} }
else else