more sensible opts parsing

1 files changed, 26 insertions, 10 deletions

diff --git a/js/ui/evolver.js b/js/ui/evolver.js
index f41ab42..8e889f4 100644
--- a/js/ui/evolver.js
+++ b/js/ui/evolver.js
@@ -10,11 +10,27 @@ var evolver = (function(){
     strokes: 1,
     randomize: false,
   }
-  if (window.location.hash.length) {
-    window.location.hash.replace("#","").split("&").forEach(function(s){
-      var kv = s.split("=")
-      if (opt.hasOwnProperty(kv[0])) {
-        opt[kv[0]] = kv[0] == "src" ? kv[1] : parseInt(kv[1])
+  var hash = window.location.search || window.location.hash
+  if (hash) {
+    hash.substr(1).split("&").forEach(function(s){
+      var kv = s.split("="), key = kv[0], val = kv[1]
+      switch (key) {
+        case 'w':
+        case 'h':
+        case 'population':
+        case 'strokes':
+          opt[key] = parseInt(val)
+          break
+        case 'randomize':
+          opt.randomize = val == "true"
+          break
+        case 'src':
+          opt[key] = val
+          break
+        default:
+          if (opt.hasOwnProperty(key)) {
+            opt[key] = val
+          }
       }
     })
   }
@@ -70,11 +86,6 @@ var evolver = (function(){
   function ready () {
     main_canvas = canvas
     canvas.resize(opt.w, opt.h)
-    if (opt.randomize) {
-      canvas.forEach(function(lex,x,y){
-        lex.bg = randint(16)
-      })
-    }
     for (var i = 0; i < clone_count; i++) {
       clones[i] = {
         el: document.createElement("div"),
@@ -85,6 +96,11 @@ var evolver = (function(){
       clones[i].canvas.forEach(function(lex){
         lex.build = noop
       })
+      if (opt.randomize) {
+        clones[i].canvas.forEach(function(lex,x,y){
+          lex.bg = randint(16)
+        })
+      }
     }
     controls.fg.update = noop
     controls.bg.update = noop