Mercurial > hg
diff tests/test-highlight.t @ 33390:32331f54930c
hgweb: re-implement followlines UI selection using buttons
This changeset attempts to solve two issues with the "followlines" UI in
hgweb. First the "followlines" action is currently not easily discoverable
(one has to hover on a line for some time, wait for the invite message to
appear and then perform some action). Second, it gets in the way of natural
line selection, especially in filerevision view.
This changeset introduces an additional markup element (a <button
class="btn-followlines">) alongside each content line of the view. This button
now holds events for line selection that were previously plugged onto content
lines directly. Consequently, there's no more action on content lines, hence
restoring the "natural line selection" behavior (solving the second problem).
These buttons are hidden by default and get displayed upon hover of content
lines; then upon hover of a button itself, a text inviting followlines section
shows up. This solves the first problem (discoverability) as we now have a
clear visual element indicating that "some action could be perform" (i.e. a
button) and that is self-documented.
In followlines.js, all event listeners are now attached to these <button>
elements. The custom "floating tooltip" element is dropped as <button>
elements are now self-documented through a "title" attribute that changes
depending on preceding actions (selection started or not, in particular).
The new <button> element is inserted in followlines.js script (thus only
visible if JavaScript is activated); it contains a "+" and "-" with a
"diff-semantics" style; upon hover, it scales up.
To find the parent element under which to insert the <button> we either rely
on the "data-selectabletag" attribute (which defines the HTML tag of children
of class="sourcelines" element e.g. <span> for filerevision view and <tr> for
annotate view) or use a child of the latter elements if we find an element
with class="followlines-btn-parent" (useful for annotate view, for which we
have to find the <td> in which to insert the <button>).
On noticeable change in CSS concerns the "margin-left" of span:before
pseudo-elements in filelog view that has been increased a bit in order to
leave space for the new button to appear between line number column and
line content one.
Also note the "z-index" addition for "annotate-info" box so that the latter
appears on top of new buttons (instead of getting hidden).
In some respect, the UI similar to line commenting feature that is implemented
in popular code hosting site like GitHub, BitBucket or Kallithea.
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Mon, 03 Jul 2017 13:49:03 +0200 |
| parents | 1c97df5e3b46 |
| children | 65de152ba375 |
line wrap: on
line diff
--- a/tests/test-highlight.t Sat Jul 01 20:51:19 2017 -0700 +++ b/tests/test-highlight.t Mon Jul 03 13:49:03 2017 +0200 @@ -314,7 +314,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l1"> 1</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></td> + <td class="source followlines-btn-parent"><a href="#l1"> 1</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></td> </tr> <tr id="l2" class="thisrev"> <td class="annotate parity0"> @@ -331,7 +331,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l2"> 2</a> </td> + <td class="source followlines-btn-parent"><a href="#l2"> 2</a> </td> </tr> <tr id="l3" class="thisrev"> <td class="annotate parity0"> @@ -348,7 +348,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l3"> 3</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td> + <td class="source followlines-btn-parent"><a href="#l3"> 3</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td> </tr> <tr id="l4" class="thisrev"> <td class="annotate parity0"> @@ -365,7 +365,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l4"> 4</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></td> + <td class="source followlines-btn-parent"><a href="#l4"> 4</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></td> </tr> <tr id="l5" class="thisrev"> <td class="annotate parity0"> @@ -382,7 +382,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l5"> 5</a> <span class="sd">"""</span></td> + <td class="source followlines-btn-parent"><a href="#l5"> 5</a> <span class="sd">"""</span></td> </tr> <tr id="l6" class="thisrev"> <td class="annotate parity0"> @@ -399,7 +399,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l6"> 6</a> </td> + <td class="source followlines-btn-parent"><a href="#l6"> 6</a> </td> </tr> <tr id="l7" class="thisrev"> <td class="annotate parity0"> @@ -416,7 +416,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l7"> 7</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td> + <td class="source followlines-btn-parent"><a href="#l7"> 7</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td> </tr> <tr id="l8" class="thisrev"> <td class="annotate parity0"> @@ -433,7 +433,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l8"> 8</a> </td> + <td class="source followlines-btn-parent"><a href="#l8"> 8</a> </td> </tr> <tr id="l9" class="thisrev"> <td class="annotate parity0"> @@ -450,7 +450,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l9"> 9</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td> + <td class="source followlines-btn-parent"><a href="#l9"> 9</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td> </tr> <tr id="l10" class="thisrev"> <td class="annotate parity0"> @@ -467,7 +467,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l10"> 10</a> <span class="sd">"""Generate all primes."""</span></td> + <td class="source followlines-btn-parent"><a href="#l10"> 10</a> <span class="sd">"""Generate all primes."""</span></td> </tr> <tr id="l11" class="thisrev"> <td class="annotate parity0"> @@ -484,7 +484,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l11"> 11</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> + <td class="source followlines-btn-parent"><a href="#l11"> 11</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> </tr> <tr id="l12" class="thisrev"> <td class="annotate parity0"> @@ -501,7 +501,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l12"> 12</a> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td> + <td class="source followlines-btn-parent"><a href="#l12"> 12</a> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td> </tr> <tr id="l13" class="thisrev"> <td class="annotate parity0"> @@ -518,7 +518,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l13"> 13</a> <span class="c"># It is important to yield *here* in order to stop the</span></td> + <td class="source followlines-btn-parent"><a href="#l13"> 13</a> <span class="c"># It is important to yield *here* in order to stop the</span></td> </tr> <tr id="l14" class="thisrev"> <td class="annotate parity0"> @@ -535,7 +535,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l14"> 14</a> <span class="c"># infinite recursion.</span></td> + <td class="source followlines-btn-parent"><a href="#l14"> 14</a> <span class="c"># infinite recursion.</span></td> </tr> <tr id="l15" class="thisrev"> <td class="annotate parity0"> @@ -552,7 +552,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l15"> 15</a> <span class="kn">yield</span> <span class="n">p</span></td> + <td class="source followlines-btn-parent"><a href="#l15"> 15</a> <span class="kn">yield</span> <span class="n">p</span></td> </tr> <tr id="l16" class="thisrev"> <td class="annotate parity0"> @@ -569,7 +569,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l16"> 16</a> <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td> + <td class="source followlines-btn-parent"><a href="#l16"> 16</a> <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td> </tr> <tr id="l17" class="thisrev"> <td class="annotate parity0"> @@ -586,7 +586,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l17"> 17</a> <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> + <td class="source followlines-btn-parent"><a href="#l17"> 17</a> <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> </tr> <tr id="l18" class="thisrev"> <td class="annotate parity0"> @@ -603,7 +603,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l18"> 18</a> <span class="kn">yield</span> <span class="n">n</span></td> + <td class="source followlines-btn-parent"><a href="#l18"> 18</a> <span class="kn">yield</span> <span class="n">n</span></td> </tr> <tr id="l19" class="thisrev"> <td class="annotate parity0"> @@ -620,7 +620,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l19"> 19</a> </td> + <td class="source followlines-btn-parent"><a href="#l19"> 19</a> </td> </tr> <tr id="l20" class="thisrev"> <td class="annotate parity0"> @@ -637,7 +637,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l20"> 20</a> <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mi">2</span> <span class="o">==</span> <span class="mi">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td> + <td class="source followlines-btn-parent"><a href="#l20"> 20</a> <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mi">2</span> <span class="o">==</span> <span class="mi">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td> </tr> <tr id="l21" class="thisrev"> <td class="annotate parity0"> @@ -654,7 +654,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l21"> 21</a> <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mi">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o"><</span> <span class="mi">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td> + <td class="source followlines-btn-parent"><a href="#l21"> 21</a> <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mi">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o"><</span> <span class="mi">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td> </tr> <tr id="l22" class="thisrev"> <td class="annotate parity0"> @@ -671,7 +671,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l22"> 22</a> </td> + <td class="source followlines-btn-parent"><a href="#l22"> 22</a> </td> </tr> <tr id="l23" class="thisrev"> <td class="annotate parity0"> @@ -688,7 +688,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l23"> 23</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></td> + <td class="source followlines-btn-parent"><a href="#l23"> 23</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></td> </tr> <tr id="l24" class="thisrev"> <td class="annotate parity0"> @@ -705,7 +705,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l24"> 24</a> <span class="kn">import</span> <span class="nn">sys</span></td> + <td class="source followlines-btn-parent"><a href="#l24"> 24</a> <span class="kn">import</span> <span class="nn">sys</span></td> </tr> <tr id="l25" class="thisrev"> <td class="annotate parity0"> @@ -722,7 +722,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l25"> 25</a> <span class="kn">try</span><span class="p">:</span></td> + <td class="source followlines-btn-parent"><a href="#l25"> 25</a> <span class="kn">try</span><span class="p">:</span></td> </tr> <tr id="l26" class="thisrev"> <td class="annotate parity0"> @@ -739,7 +739,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l26"> 26</a> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span></td> + <td class="source followlines-btn-parent"><a href="#l26"> 26</a> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span></td> </tr> <tr id="l27" class="thisrev"> <td class="annotate parity0"> @@ -756,7 +756,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l27"> 27</a> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td> + <td class="source followlines-btn-parent"><a href="#l27"> 27</a> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td> </tr> <tr id="l28" class="thisrev"> <td class="annotate parity0"> @@ -773,7 +773,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l28"> 28</a> <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></td> + <td class="source followlines-btn-parent"><a href="#l28"> 28</a> <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></td> </tr> <tr id="l29" class="thisrev"> <td class="annotate parity0"> @@ -790,7 +790,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l29"> 29</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td> + <td class="source followlines-btn-parent"><a href="#l29"> 29</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td> </tr> <tr id="l30" class="thisrev"> <td class="annotate parity0"> @@ -807,7 +807,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l30"> 30</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td> + <td class="source followlines-btn-parent"><a href="#l30"> 30</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td> </tr> <tr id="l31" class="thisrev"> <td class="annotate parity0"> @@ -824,7 +824,7 @@ <a href="/rev/1af356141006">changeset</a> </div> </td> - <td class="source"><a href="#l31"> 31</a> </td> + <td class="source followlines-btn-parent"><a href="#l31"> 31</a> </td> </tr> </tbody> </table>