1263332 - Avoid startup JavaScript strict warning in DirectoryLinksProvider.jsm

Status: RESOLVED FIXED

(Firefox :: New Tab Page, defect)

Description

[Jonathan Watt [:jwatt]]

During startup the console noise includes:

JavaScript strict warning: resource:///modules/DirectoryLinksProvider.jsm, line 647: ReferenceError: reference to undefined property link.enhancedImageURI

The |this.isURLAllowed(link.enhancedImageURI, ALLOWED_IMAGE_SCHEMES)| check added in http://hg.mozilla.org/mozilla-central/rev/c742dcb56135 (bug 1088729) is causing this. The comment there implies that |link.imageURI| may also be undefined.

The code here should check that link.imageURI and link.enhancedImageURI are defined before passing them to isURLAllowed().

Comment 1

[Jonathan Watt [:jwatt]]

Attachment: patch

Comment 2

[Matthew N. [:MattN]]

Comment on attachment 8740913 [details] [diff] [review]
patch

Review of attachment 8740913 [details] [diff] [review]:
-----------------------------------------------------------------

Stealing this too since it's simple.

::: browser/modules/DirectoryLinksProvider.jsm
@@ +644,5 @@
>          // Make sure the link url is allowed and images too if they exist
>          return this.isURLAllowed(link.url, ALLOWED_LINK_SCHEMES, false) &&
> +               (!('imageURI' in link) ||
> +                this.isURLAllowed(link.imageURI, ALLOWED_IMAGE_SCHEMES, checkBase)) &&
> +               (!('enhancedImageURI' in link) ||

This file and most in /browser/ uses double-quotes… but we generally prefer the simpler truthiness check instead of `in` which also avoids a pair of braces:
(!link.imageURI || this.isURLAllowed(link.imageURI, ALLOWED_IMAGE_SCHEMES, checkBase)) &&
(!link.enhancedImageURI || this.isURLAllowed(link.enhancedImageURI, ALLOWED_IMAGE_SCHEMES, checkBase));

Comment 3

[Jonathan Watt [:jwatt]]

(In reply to Matthew N. [:MattN] (behind on reviews) from comment #2)
> Stealing this too since it's simple.

Thank you!

Comment 4

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/bd74613c5184

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/bd74613c5184