Merge lp:~rockstar/launchpad/bug-517266 into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi Aaron-

  So, this is a change to the popupdiff info on the bugs page. Basically, if
the diff has no lines of difference, there won't be a node for 'a.diff-link'.
In those cases, we have nothing to highlight or attach events to.

  I don't think we can test this other than actually walking through it by
hand. Windmill doesn't have a way to say "There aren't any errors in the
browser, right?"

Cheers,
Paul

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 merge approve

> I don't think we can test this other than actually walking through it by
> hand. Windmill doesn't have a way to say "There aren't any errors in the
> browser, right?"

There might be a way to say "this was never called", but I think it's
fine to land like this.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkt+6AIACgkQ0F+nu1YWqI0TpQCfXQ17r/8Al7+bHuTFwN+DAXBP
WeEAn1ug77anicvtZ8C9SKCpITs8MVSF
=XT8J
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'lib/canonical/launchpad/javascript/code/popupdiff.js'
--- lib/canonical/launchpad/javascript/code/popupdiff.js	2009-11-19 08:17:29 +0000
+++ lib/canonical/launchpad/javascript/code/popupdiff.js	2010-02-19 17:48:18 +0000
@@ -99,13 +99,15 @@
  */
 function link_popup_diff_onclick(node) {
     var a = node.query('a.diff-link');
-    a.addClass('js-action');
-    var librarian_url = a.getAttribute('href');
-    var api_url = node.query('a.api-ref').getAttribute('href');
-    a.on('click', function(e) {
-            e.preventDefault();
-            display_diff(a, api_url, librarian_url);
-        });
+    if (Y.Lang.isValue(a)) {
+        a.addClass('js-action');
+        var librarian_url = a.getAttribute('href');
+        var api_url = node.query('a.api-ref').getAttribute('href');
+        a.on('click', function(e) {
+                e.preventDefault();
+                display_diff(a, api_url, librarian_url);
+            });
+    }
 }
 
 /*