Launchpad itself

Merge lp:~wallyworld/launchpad/filebug-choicepopup-fix into lp:launchpad

  1. filebug-choicepopup-fix
  2. Merge into devel
Proposed by Ian Booth
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 15336
Proposed branch: lp:~wallyworld/launchpad/filebug-choicepopup-fix
Merge into: lp:launchpad
Diff against target: 35 lines (+4/-3)
2 files modified
lib/lp/app/javascript/choice.js (+1/-1)
lib/lp/bugs/javascript/tests/test_filebug.js (+3/-2)
To merge this branch: bzr merge lp:~wallyworld/launchpad/filebug-choicepopup-fix
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+108064@code.launchpad.net

Commit message

Fix status and importance popup activation icon html.

Description of the change

== Implementation ==

Fix the html used for the staus and importance popups to remove the img from the anchor and use a sprite.

== Tests ==

Update yui test.
Check using firefox and chrome.

== Lint ==

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/app/javascript/choice.js
  lib/lp/bugs/javascript/tests/test_filebug.js

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/app/javascript/choice.js'
2--- lib/lp/app/javascript/choice.js 2012-05-28 12:42:32 +0000
3+++ lib/lp/app/javascript/choice.js 2012-05-30 21:57:19 +0000
4@@ -62,7 +62,7 @@
5
6 var choice_node = Y.Node.create([
7 '<span id="' + field_name + '-content"><span class="value"></span>',
8- '<a href="#"><img class="sprite edit editicon"/>&nbsp;</a></span>'
9+ '&nbsp;<a class="sprite edit editicon" href="#"></a></span>'
10 ].join(' '));
11
12 legacy_field_node.insertBefore(choice_node, legacy_field_node);
13
14=== modified file 'lib/lp/bugs/javascript/tests/test_filebug.js'
15--- lib/lp/bugs/javascript/tests/test_filebug.js 2012-05-28 22:47:56 +0000
16+++ lib/lp/bugs/javascript/tests/test_filebug.js 2012-05-30 21:57:19 +0000
17@@ -119,7 +119,7 @@
18 Y.lp.bugs.filebug.setup_filebug(true);
19 var status_node = Y.one('#status-content .value');
20 Y.Assert.areEqual('New', status_node.get('text'));
21- var status_edit_node = Y.one('#status-content a img.edit');
22+ var status_edit_node = Y.one('#status-content a.sprite.edit');
23 Y.Assert.isNotNull(status_edit_node);
24 var legacy_dropdown = Y.one('[id=field.status]');
25 Y.Assert.isTrue(legacy_dropdown.hasClass('unseen'));
26@@ -130,7 +130,8 @@
27 Y.lp.bugs.filebug.setup_filebug(true);
28 var importance_node = Y.one('#importance-content .value');
29 Y.Assert.areEqual('Undecided', importance_node.get('text'));
30- var importance_edit_node = Y.one('#status-content a img.edit');
31+ var importance_edit_node =
32+ Y.one('#importance-content a.sprite.edit');
33 Y.Assert.isNotNull(importance_edit_node);
34 var legacy_dropdown = Y.one('[id=field.importance]');
35 Y.Assert.isTrue(legacy_dropdown.hasClass('unseen'));