Mercurial > hg
changeset 19430:5ec5097b4c0f
hgweb: add line wrapping switch to file source view
This uses classList property, which is well-supported now: both Chromium 8.0+,
Firefox 3.6+ and Opera 11.5+ support it, as well as relatively modern versions
of other browsers.
author | Alexander Plavin <me@aplavin.ru> |
---|---|
date | Fri, 12 Jul 2013 15:58:13 +0400 |
parents | c8490dcc5fb3 |
children | b8ecc3830c89 |
files | mercurial/templates/paper/filerevision.tmpl mercurial/templates/static/mercurial.js mercurial/templates/static/style-paper.css tests/test-hgweb-commands.t tests/test-highlight.t |
diffstat | 5 files changed, 40 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/paper/filerevision.tmpl Tue Jul 09 02:08:24 2013 +0400 +++ b/mercurial/templates/paper/filerevision.tmpl Fri Jul 12 15:58:13 2013 +0400 @@ -67,8 +67,9 @@ </table> <div class="overflow"> +<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div> <div class="sourcefirst"> line source</div> -<pre class="sourcelines">{text%fileline}</pre> +<pre class="sourcelines wrap">{text%fileline}</pre> <div class="sourcelast"></div> </div> </div>
--- a/mercurial/templates/static/mercurial.js Tue Jul 09 02:08:24 2013 +0400 +++ b/mercurial/templates/static/mercurial.js Fri Jul 12 15:58:13 2013 +0400 @@ -271,3 +271,29 @@ document.getElementById('diffstatdetails').style.display = curexpand; document.getElementById('diffstatexpand').style.display = curdetails; } + +function toggleLinewrap() { + function getLinewrap() { + var nodes = document.getElementsByClassName('sourcelines'); + // if there are no such nodes, error is thrown here + return nodes[0].classList.contains('wrap'); + } + + function setLinewrap(enable) { + var nodes = document.getElementsByClassName('sourcelines'); + for (var i = 0; i < nodes.length; i++) { + if (enable) { + nodes[i].classList.add('wrap'); + } else { + nodes[i].classList.remove('wrap'); + } + } + + var links = document.getElementsByClassName('linewraplink'); + for (var i = 0; i < links.length; i++) { + links[i].innerHTML = enable ? 'on' : 'off'; + } + } + + setLinewrap(!getLinewrap()); +}
--- a/mercurial/templates/static/style-paper.css Tue Jul 09 02:08:24 2013 +0400 +++ b/mercurial/templates/static/style-paper.css Fri Jul 12 15:58:13 2013 +0400 @@ -214,11 +214,18 @@ position: relative; } +.wrap > span { + white-space: pre-wrap; +} + +.linewraptoggle { + float: right; +} + .sourcelines > span { display: inline-block; width: 100%; padding: 1px 0px; - white-space: pre-wrap; counter-increment: lineno; }
--- a/tests/test-hgweb-commands.t Tue Jul 09 02:08:24 2013 +0400 +++ b/tests/test-hgweb-commands.t Fri Jul 12 15:58:13 2013 +0400 @@ -667,8 +667,9 @@ </table> <div class="overflow"> + <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div> <div class="sourcefirst"> line source</div> - <pre class="sourcelines"> + <pre class="sourcelines wrap"> <span id="l1">foo</span><a href="#l1"></a></pre> <div class="sourcelast"></div> </div>
--- a/tests/test-highlight.t Tue Jul 09 02:08:24 2013 +0400 +++ b/tests/test-highlight.t Fri Jul 12 15:58:13 2013 +0400 @@ -136,8 +136,9 @@ </table> <div class="overflow"> + <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div> <div class="sourcefirst"> line source</div> - <pre class="sourcelines"> + <pre class="sourcelines wrap"> <span id="l1"><span class="c">#!/usr/bin/env python</span></span><a href="#l1"></a> <span id="l2"></span><a href="#l2"></a> <span id="l3"><span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></span><a href="#l3"></a>