libs/web: readd add/remove icons to dynamic list widgets

2 files changed, 59 insertions, 8 deletions

diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js
index 0022149294..44a5b2aec7 100644
--- a/libs/web/htdocs/luci-static/resources/cbi.js
+++ b/libs/web/htdocs/luci-static/resources/cbi.js
@@ -402,16 +402,24 @@ function cbi_filebrowser(id, url, defpath) {
 	browser.focus();
 }
 
-function cbi_dynlist_init(name)
+function cbi_dynlist_init(name, respath)
 {
 	function cbi_dynlist_renumber(e)
 	{
-		var count = 1;
-		var childs = e.parentNode.childNodes;
-
-		for( var i = 0; i < childs.length; i++ )
-			if( childs[i].name == name )
-				childs[i].id = name + '.' + (count++);
+		/* in a perfect world, we could just getElementsByName() - but not if
+		 * MSIE is involved... */
+		var inputs = [ ]; // = document.getElementsByName(name);
+		for (var i = 0; i < e.parentNode.childNodes.length; i++)
+			if (e.parentNode.childNodes[i].name == name)
+				inputs.push(e.parentNode.childNodes[i]);
+
+		for (var i = 0; i < inputs.length; i++)
+		{
+			inputs[i].id = name + '.' + (i + 1);
+			inputs[i].nextSibling.src = respath + (
+				(i+1) < inputs.length ? '/cbi/remove.gif' : '/cbi/add.gif'
+			);
+		}
 
 		e.focus();
 	}
@@ -480,6 +488,7 @@ function cbi_dynlist_init(name)
 
 				if (se.value.length == 0 && jump)
 				{
+					se.parentNode.removeChild(se.nextSibling.nextSibling);
 					se.parentNode.removeChild(se.nextSibling);
 					se.parentNode.removeChild(se);
 
@@ -488,6 +497,9 @@ function cbi_dynlist_init(name)
 					if (ev.preventDefault)
 						ev.preventDefault();
 
+					/* IE Quirk, needs double focus somehow */
+					jump.focus();
+
 					return false;
 				}
 
@@ -499,17 +511,22 @@ function cbi_dynlist_init(name)
 					n.name       = se.name;
 					n.type       = se.type;
 
+				var b = document.createElement('img');
+
 				cbi_bind(n, 'keydown',  cbi_dynlist_keydown);
 				cbi_bind(n, 'keypress', cbi_dynlist_keypress);
+				cbi_bind(b, 'click',    cbi_dynlist_btnclick);
 
 				if (next)
 				{
 					se.parentNode.insertBefore(n, next);
+					se.parentNode.insertBefore(b, next);
 					se.parentNode.insertBefore(document.createElement('br'), next);
 				}
 				else
 				{
 					se.parentNode.appendChild(n);
+					se.parentNode.appendChild(b);
 					se.parentNode.appendChild(document.createElement('br'));
 				}
 
@@ -540,11 +557,45 @@ function cbi_dynlist_init(name)
 		return true;
 	}
 
+	function cbi_dynlist_btnclick(ev)
+	{
+		ev = ev ? ev : window.event;
+
+		var se = ev.target ? ev.target : ev.srcElement;
+
+		if (se.src.indexOf('remove') > -1)
+		{
+			se.previousSibling.value = '';
+
+			cbi_dynlist_keydown({
+				target:  se.previousSibling,
+				keyCode: 8
+			});
+		}
+		else
+		{
+			cbi_dynlist_keydown({
+				target:  se.previousSibling,
+				keyCode: 13
+			});
+		}
+
+		return false;
+	}
+
 	var inputs = document.getElementsByName(name);
 	for( var i = 0; i < inputs.length; i++ )
 	{
+		var btn = document.createElement('img');
+			btn.src = respath + (
+				(i+1) < inputs.length ? '/cbi/remove.gif' : '/cbi/add.gif'
+			);
+
+		inputs[i].parentNode.insertBefore(btn, inputs[i].nextSibling);
+
 		cbi_bind(inputs[i], 'keydown',  cbi_dynlist_keydown);
 		cbi_bind(inputs[i], 'keypress', cbi_dynlist_keypress);
+		cbi_bind(btn,       'click',    cbi_dynlist_btnclick);
 	}
 }
 
diff --git a/libs/web/luasrc/view/cbi/dynlist.htm b/libs/web/luasrc/view/cbi/dynlist.htm
index a78121ba9f..ac9fe34829 100644
--- a/libs/web/luasrc/view/cbi/dynlist.htm
+++ b/libs/web/luasrc/view/cbi/dynlist.htm
@@ -27,7 +27,7 @@ $Id$
 <% end end %>
 </div>
 <script type="text/javascript">
-cbi_dynlist_init('<%=cbid%>');
+cbi_dynlist_init('<%=cbid%>', '<%=resource%>');
 <% if self.datatype then -%>
 	<% if #self.keylist > 0 then -%>
 		cbi_combobox_init('<%=cbid .. "." .. i%>', {