Merge lp:~deryck/lazr-js/stop-all-those-null-choice-edit-icons into lp:lazr-js

[Deryck Hodge]

Ensure NullChoiceSource widget does not continue to append remove icons with each click to open the widget.

This fixes bug 514190, which notes that every time you open and
close the milestone widget on a Launchpad bug page a bug, you get an
extra remove icon. This is because the widget didn't check to see
if the icon already existed before adding another. This branch
fixes that with a simple sniff of the string to see if we smell
"<img" or not.

I didn't add a test to this for a couple reasons.

1. It seems silly to test this to me
2. icons shouldn't be hardcoded, and therefore, not tested

There's much more work to make this null choice edit widget generic
and re-usable, but I wanted to fix the bug on Launchpad.

Thanks for the review!

Cheers,
deryck

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'src-js/lazrjs/choiceedit/choiceedit.js'
--- src-js/lazrjs/choiceedit/choiceedit.js	2010-04-13 13:02:44 +0000
+++ src-js/lazrjs/choiceedit/choiceedit.js	2010-09-23 19:27:53 +0000
@@ -634,7 +634,10 @@
                 });
             }
             for (var i = 0; i < v.length; i++) {
-                if (!Y.Lang.isValue(v[i].value)) {
+                if (!Y.Lang.isValue(v[i].value) &&
+                    v[i].name.indexOf('<img') == -1) {
+                    // Only append the icon if the value for this item is
+                    // null, and the img tag is not already found.
                     v[i].name = [
                         '<img src="https://launchpad.net/@@/remove" ',
                         '     style="margin-right: 0.5em; border: none; ',