diff options
author | Yorhel <git@yorhel.nl> | 2009-01-16 15:16:39 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2009-01-16 15:16:39 +0100 |
commit | 9ee7694a4b6f7dce174ec785cf5a71a5a38774bb (patch) | |
tree | 38e6dbb83d21dffec285f731fc1ae421e55801f5 /static | |
parent | 6dc9a434619d28f87eaf768b00d3696bb7c24c61 (diff) | |
parent | 910bb9f397cec1a49526e09e7d2c9b856bd5bdae (diff) |
Merge branch 'beta'2.2
Diffstat (limited to 'static')
-rw-r--r-- | static/f/forms.js | 4 | ||||
-rw-r--r-- | static/s/angel/conf | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/static/f/forms.js b/static/f/forms.js index cd65058d..e25a880c 100644 --- a/static/f/forms.js +++ b/static/f/forms.js @@ -126,7 +126,7 @@ function dsKeyDown(ev) { if(obj.selectedId != 0) obj.value = obj.serFunc(x('ds_box_'+obj.selectedId).itemData); - else if(obj.returnFunc) + if(obj.returnFunc) obj.returnFunc(); if(x('ds_box')) x('ds_box').style.top = '-500px'; @@ -234,6 +234,8 @@ function dsResults(hr, obj) { }; tr.onclick = function() { obj.value = obj.serFunc(this.itemData); + if(obj.returnFunc) + obj.returnFunc(); if(x('ds_box')) x('ds_box').style.top = '-500px'; obj.selectedId = 0; diff --git a/static/s/angel/conf b/static/s/angel/conf index 72df41b0..f554cec3 100644 --- a/static/s/angel/conf +++ b/static/s/angel/conf @@ -10,7 +10,7 @@ statnok #c00 // generoc 'not ok' text color (used for above, and as border footer #135 // text color of the footer // titles -maintitle #135 // text color of the site title +maintitle #135 // text color of the site title, set to '0' to hide the main title boxtitle #258 // box titles alttitle #fff // alternative title |