changeset 126:b54b1c29b3f5 gmap2

Simplify collapse.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 09 Mar 2014 12:21:24 +0200
parents 0f8075eee7fe
children 324a169ee8b6
files index.html nav.js
diffstat 2 files changed, 26 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Sun Mar 09 12:20:58 2014 +0200
+++ b/index.html	Sun Mar 09 12:21:24 2014 +0200
@@ -37,7 +37,7 @@
    </div>
    <div id="sidecoll">
     <div id="collbuttondiv">
-     <a href="javascript:docoll()">
+     <a href="javascript:qdocollapse()">
       <img src="img/right.gif" id="collbutton">
      </a>
     </div>
--- a/nav.js	Sun Mar 09 12:20:58 2014 +0200
+++ b/nav.js	Sun Mar 09 12:21:24 2014 +0200
@@ -1,33 +1,35 @@
 // $Id: nav.js 2291 2009-09-21 14:43:50Z ggr $
-var collapsed = 0;
+var collapsed = false;
 var css_sidecoll = document.getElementById("sidecoll").style.right;
 var css_footer = document.getElementById("footer").style.right;
 var css_map_right = document.getElementById("map").style.right;
 var css_map_top = document.getElementById("map").style.top;
 
-function docoll()
+
+function qse(name)
 {
-  if (collapsed == 0)
-  {
-    document.getElementById("header").style.display = "none";
+  return document.getElementById(name);
+}
+
+
+function qle(v1, v2)
+{
+  return collapsed ? v1 : v2;
+}
+
 
-    document.getElementById("sidebar").style.display = "none";
-    document.getElementById("sidecoll").style.right = "0px";
-    document.getElementById("footer").style.right = "0px";
-    document.getElementById("map").style.right = "8px";
-    document.getElementById("map").style.top = "0px";
-    document.getElementById("collbutton").src = "i/left.gif";
-    collapsed = 1;
-  }
+function qdocollapse()
+{
+  if (collapsed)
+    collapsed = false;
   else
-  {
-    document.getElementById("header").style.display = "block";
-    document.getElementById("sidebar").style.display = "block";
-    document.getElementById("sidecoll").style.right = css_sidecoll;
-    document.getElementById("footer").style.right = css_footer;
-    document.getElementById("map").style.right = css_map_right;
-    document.getElementById("map").style.top = css_map_top;
-    document.getElementById("collbutton").src = "i/right.gif";
-    collapsed = 0;
-  }
+    collapsed = true;
+
+  qse("header").style.display   = qle("none"    , "block");
+  qse("sidebar").style.display  = qle("none"    , "block");
+  qse("sidecoll").style.right   = qle("0px"     , css_sidecoll);
+  qse("footer").style.right     = qle("0px"     , css_footer);
+  qse("map").style.right        = qle("8px"     , css_map_right);
+  qse("map").style.top          = qle("0px"     , css_map_top);
+  qse("collbutton").src         = qle("img/left.gif" , "img/right.gif");
 }