Merge pull request #127 from benadida/dmgawel-fix-getjson-xss

Upgrade jQuery 1.2.6

Merge pull request #127 from benadida/dmgawel-fix-getjson-xss
2e5938cf · Ben Adida · a9ed15ca · a6055d9c · 2e5938cf · 2e5938cf
Commit 2e5938cf authored May 7, 2016 by Ben Adida
--- a/heliosbooth/build-helios-booth-compressed.txt
+++ b/heliosbooth/build-helios-booth-compressed.txt
-uglifyjs js/jscrypto/class.js js/jscrypto/bigint.dummy.js js/jscrypto/jsbn.js js/jscrypto/jsbn2.js js/jscrypto/sjcl.js js/underscore-min.js js/jquery-1.2.2.min.js js/jquery.query-2.1.5.js js/jquery-jtemplates.js js/jquery.json.min.js js/jscrypto/bigint.js js/jscrypto/random.js js/jscrypto/elgamal.js js/jscrypto/sha1.js js/jscrypto/sha2.js js/jscrypto/helios.js > js/20140302-helios-booth-compressed.js
+uglify -s js/jscrypto/class.js,js/jscrypto/bigint.dummy.js,js/jscrypto/jsbn.js,js/jscrypto/jsbn2.js,js/jscrypto/sjcl.js,js/underscore-min.js,js/jquery-1.2.6.min.js,js/jquery.query-2.1.5.js,js/jquery-jtemplates.js,js/jquery.json.min.js,js/jscrypto/bigint.js,js/jscrypto/random.js,js/jscrypto/elgamal.js,js/jscrypto/sha1.js,js/jscrypto/sha2.js,js/jscrypto/helios.js -o js/20160507-helios-booth-compressed.js
--- a/heliosbooth/js/20160507-helios-booth-compressed.js
+++ b/heliosbooth/js/20160507-helios-booth-compressed.js
--- a/heliosbooth/js/jquery-1.2.2.min.js
+++ b/heliosbooth/js/jquery-1.2.2.min.js
--- a/heliosbooth/js/jquery-1.2.6.min.js
+++ b/heliosbooth/js/jquery-1.2.6.min.js
--- a/heliosbooth/single-ballot-verify.html
+++ b/heliosbooth/single-ballot-verify.html
@@ -9,7 +9,7 @@
  <script language="javascript" src="js/jscrypto/jsbn2.js"></script>
  <script language="javascript" src="js/jscrypto/sjcl.js"></script>
  <script language="javascript" src="js/underscore-min.js"></script>
-  <script language="javascript" src="js/jquery-1.2.2.min.js"></script>
+  <script language="javascript" src="js/jquery-1.2.6.min.js"></script>
  <script language="javascript" src="js/jquery-jtemplates.js"></script>
  <script language="javascript" src="js/jquery.json.min.js"></script>
  <script language="javascript" src="js/jquery.query-2.1.5.js"></script>

--- a/heliosbooth/vote.html
+++ b/heliosbooth/vote.html
@@ -24,7 +24,7 @@
  <script language="javascript" src="js/jscrypto/sha2.js"></script>
  <script language="javascript" src="js/jscrypto/helios.js"></script>-->
  
-  <script language="javascript" src="js/20140302-helios-booth-compressed.js"></script>
+  <script language="javascript" src="js/20160507-helios-booth-compressed.js"></script>
 </head>
 <body>
 <div id="wrapper">