Patchwork [V2] hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat

login
register
mail settings
Submitter Alexander Plavin
Date July 13, 2013, 10 a.m.
Message ID <6c49903f66be1a7185d5.1373709623@debian-alexander.dolgopa>
Download mbox | patch
Permalink /patch/1855/
State Accepted
Commit c3cdba6e5d7f06935022639bc339a495eb4f2e93
Headers show

Comments

Alexander Plavin - July 13, 2013, 10 a.m.
# HG changeset patch
# User Alexander Plavin <me@aplavin.ru>
# Date 1373630471 -14400
#      Fri Jul 12 16:01:11 2013 +0400
# Node ID 6c49903f66be1a7185d54e1e0df5419d64238e11
# Parent  9fb070f1aefb7b75994dad554ad32eb111417cea
hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat

This eliminates the need of two almost equal functions, makes the code cleaner.

Patch

diff -r 9fb070f1aefb -r 6c49903f66be mercurial/templates/paper/changeset.tmpl
--- a/mercurial/templates/paper/changeset.tmpl	Sat Jun 29 14:36:51 2013 +0400
+++ b/mercurial/templates/paper/changeset.tmpl	Fri Jul 12 16:01:11 2013 +0400
@@ -66,9 +66,9 @@ 
   <th class="diffstat">diffstat</th>
   <td class="diffstat">
     {diffsummary}
-    <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
+    <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a>
     <div id="diffstatdetails" style="display:none;">
-      <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
+      <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a>
       <p>
       <table>{diffstat}</table>
     </div>
diff -r 9fb070f1aefb -r 6c49903f66be mercurial/templates/static/mercurial.js
--- a/mercurial/templates/static/mercurial.js	Sat Jun 29 14:36:51 2013 +0400
+++ b/mercurial/templates/static/mercurial.js	Fri Jul 12 16:01:11 2013 +0400
@@ -265,12 +265,9 @@ 
 	}
 })(document, RegExp, Math, isNaN, Date, false, true)
 
-function showDiffstat() {
-	document.getElementById('diffstatdetails').style.display = 'inline';
-	document.getElementById('diffstatexpand').style.display = 'none';
+function toggleDiffstat() {
+    var curdetails = document.getElementById('diffstatdetails').style.display;
+    var curexpand = curdetails == 'none' ? 'inline' : 'none';
+    document.getElementById('diffstatdetails').style.display = curexpand;
+    document.getElementById('diffstatexpand').style.display = curdetails;
 }
-
-function hideDiffstat() {
-	document.getElementById('diffstatdetails').style.display = 'none';
-	document.getElementById('diffstatexpand').style.display = 'inline';
-}
diff -r 9fb070f1aefb -r 6c49903f66be tests/test-hgweb-commands.t
--- a/tests/test-hgweb-commands.t	Sat Jun 29 14:36:51 2013 +0400
+++ b/tests/test-hgweb-commands.t	Fri Jul 12 16:01:11 2013 +0400
@@ -423,9 +423,9 @@ 
     <td class="diffstat">
        2 files changed, 2 insertions(+), 0 deletions(-)
   
-      <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
+      <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a>
       <div id="diffstatdetails" style="display:none;">
-        <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
+        <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a>
         <p>
         <table>  <tr class="parity0">
       <td class="diffstat-file"><a href="#l1.1">da/foo</a></td>
diff -r 9fb070f1aefb -r 6c49903f66be tests/test-hgweb-diffs.t
--- a/tests/test-hgweb-diffs.t	Sat Jun 29 14:36:51 2013 +0400
+++ b/tests/test-hgweb-diffs.t	Fri Jul 12 16:01:11 2013 +0400
@@ -115,9 +115,9 @@ 
     <td class="diffstat">
        2 files changed, 2 insertions(+), 0 deletions(-)
   
-      <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
+      <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a>
       <div id="diffstatdetails" style="display:none;">
-        <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
+        <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a>
         <p>
         <table>  <tr class="parity0">
       <td class="diffstat-file"><a href="#l1.1">a</a></td>
@@ -376,9 +376,9 @@ 
     <td class="diffstat">
        2 files changed, 2 insertions(+), 0 deletions(-)
   
-      <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
+      <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a>
       <div id="diffstatdetails" style="display:none;">
-        <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
+        <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a>
         <p>
         <table>  <tr class="parity0">
       <td class="diffstat-file"><a href="#l1.1">a</a></td>
diff -r 9fb070f1aefb -r 6c49903f66be tests/test-hgweb-removed.t
--- a/tests/test-hgweb-removed.t	Sat Jun 29 14:36:51 2013 +0400
+++ b/tests/test-hgweb-removed.t	Fri Jul 12 16:01:11 2013 +0400
@@ -96,9 +96,9 @@ 
     <td class="diffstat">
        1 files changed, 0 insertions(+), 1 deletions(-)
   
-      <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
+      <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a>
       <div id="diffstatdetails" style="display:none;">
-        <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
+        <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a>
         <p>
         <table>  <tr class="parity0">
       <td class="diffstat-file"><a href="#l1.1">a</a></td>