Catch when a cselect has an unavailable value set

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/js/urweb.js b/lib/js/urweb.js
index ff4c7b7e..199f5001 100644
--- a/lib/js/urweb.js
+++ b/lib/js/urweb.js
@@ -1230,11 +1230,14 @@ function selectValue(x) {
 
 function setSelectValue(x, v) {
   for (var i = 0; i < x.options.length; ++i) {
-      if(x.options[i].value == v) {
+      if (x.options[i].value == v) {
           x.selectedIndex = i;
           return;
       }
   }
+
+  if (v != "")
+      er("Setting <select> to nonexistent value: " + v);
 }
 
 function sel(s, content) {
@@ -1243,8 +1246,8 @@ function sel(s, content) {
 
     var dummy = document.createElement("span");
     dummy.innerHTML = "<select>" + content + "</select>";
-    var x = input(dummy.firstChild, s, function(x) { return function(v) { if (selectValue(x) != v) setSelectValue(x, v); }; });
 
+    var x = dummy.firstChild;
     for (var i = 0; i < x.options.length; ++i) {
         if (x.options[i].value == "")
             x.options[i].value = x.options[i].text;
@@ -1252,6 +1255,8 @@ function sel(s, content) {
             x.options[i].value = x.options[i].value.substring(1);
     }
 
+    x = input(x, s, function(x) { return function(v) { if (selectValue(x) != v) setSelectValue(x, v); }; });
+
     setSelectValue(x, s.data);
     if (selectValue(x) != s.data)
         sv(s, selectValue(x));