starting to trim dead code and compress JS

a74a5edb · Ben Adida · 9c2deeaa · a74a5edb · a74a5edb · a74a5edb
Commit a74a5edb authored 11 years ago by Ben Adida
--- a/heliosbooth/vote.html
+++ b/heliosbooth/vote.html
@@ -15,21 +15,13 @@
  <script language="javascript" src="js/jquery.query-2.1.5.js"></script>
  <script language="javascript" src="js/jquery-jtemplates.js"></script>
  <script language="javascript" src="js/jquery.json.min.js"></script>
-
-  <script language="javascript">
-    // required for jscrypto library
-    var JSCRYPTO_HOME = document.location.pathname.replace("vote.html", "js/jscrypto");
-  </script>
-
  <script language="javascript" src="js/jscrypto/class.js"></script>
-  <script language="javascript" src="js/jscrypto/bigint.js?d=20111004"></script>
-  <!-- this script is a dummy wrapper for bigint when client-side crypto is not possible
-  <script language="javascript" src="js/jscrypto/bigint.dummy.js"></script>-->
+  <script language="javascript" src="js/jscrypto/bigint.js"></script>
  <script language="javascript" src="js/jscrypto/random.js"></script>
-  <script language="javascript" src="js/jscrypto/elgamal.js?d=20111004"></script>
+  <script language="javascript" src="js/jscrypto/elgamal.js"></script>
  <script language="javascript" src="js/jscrypto/sha1.js"></script>
  <script language="javascript" src="js/jscrypto/sha2.js"></script>
-  <script language="javascript" src="js/jscrypto/helios.js?d=20111004"></script>
+  <script language="javascript" src="js/jscrypto/helios.js"></script>
 </head>
 <body>
 <div id="wrapper">

--- a/server_ui/media/20140302-helios-combined.js
+++ b/server_ui/media/20140302-helios-combined.js
--- a/server_ui/templates/base.html
+++ b/server_ui/templates/base.html
@@ -7,19 +7,20 @@
  <meta name="viewport" content="width=device-width">
  <title>{% block title %}{% endblock %}</title>
  
-  
  <link rel="stylesheet" href="/static/foundation/css/foundation.css">
-
  <link rel="stylesheet" href="/static/foundation-tweaks.css">

-
+{% if settings.DEBUG %}  
  <script src="/static/foundation/js/vendor/custom.modernizr.js"></script>
-
  <script language="javascript" src="/static/helios/js/jquery-1.4.2.min.js"></script>
  <script language="javascript" src="/static/helios/js/jquery-ui-1.8.1.custom.min.js"></script>
  <script language="javascript" src="/static/helios/js/jqsplitdatetime.js"></script>
-  
  <script language="javascript" src="/static/helios/helios/jquery.json.min.js"></script>
+  <script language="javascript" src="/static/foundation/js/foundation.min.js"></script>
+
+{% else %}
+<script language="javascript" src="/static/20140302-helios-combined.js"></script>
+{% endif %}
  
  {% block js %}
  {% endblock %}
@@ -103,16 +104,8 @@ powered by <a href="http://heliosvoting.org">Helios Voting</a>.
    </div>
  
  </div>
-  <script>
-    document.write('<script src=' +
-      ('__proto__' in {} ? '/static/foundation/js/vendor/zepto' : '/static/foundation/js/vendor/jquery') +
-	'.js><\/script>')
-  </script>
-  
-      <script src="/static/foundation/js/foundation.min.js"></script>
      <script>
 	$(document).foundation();
      </script>     
-     
 </body>
 </html>