diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/cbi/htdocs/luci-static/resources/cbi.js | 6 | ||||
| -rw-r--r-- | libs/cbi/luasrc/view/cbi/value.htm | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/libs/cbi/htdocs/luci-static/resources/cbi.js b/libs/cbi/htdocs/luci-static/resources/cbi.js index d0e31e483..227e33269 100644 --- a/libs/cbi/htdocs/luci-static/resources/cbi.js +++ b/libs/cbi/htdocs/luci-static/resources/cbi.js @@ -98,7 +98,11 @@ function cbi_bind(obj, type, callback, mode) { function cbi_combobox(id, values, def, man) { var obj = document.getElementById(id) var sel = document.createElement("select"); - obj.parentNode.appendChild(sel); + if (obj.nextSibling) { + obj.parentNode.insertBefore(sel, obj.nextSibling); + } else { + obj.parentNode.appendChild(sel); + } if (!values[obj.value]) { if (obj.value == "") { diff --git a/libs/cbi/luasrc/view/cbi/value.htm b/libs/cbi/luasrc/view/cbi/value.htm index 0dc584146..d85fa81d9 100644 --- a/libs/cbi/luasrc/view/cbi/value.htm +++ b/libs/cbi/luasrc/view/cbi/value.htm @@ -26,7 +26,12 @@ $Id$ -%> }, '<%- if not self.rmempty and not self.optional then -%> <%-:cbi_select-%> - <%- end -%>', '<%:cbi_manual%>'); + <%- end -%>', ' + <%- if self.combobox_manual then -%> + <%-=self.combobox_manual-%> + <%- else -%> + <%-:cbi_manual-%> + <%- end -%>'); </script> <% end -%> <%+cbi/valuefooter%> |