Merge mozilla-central to mozilla-inbound to fix eslint-failure. r=eslint-fix

2016-08-03 17:47:16 +02:00 · 2016-08-03 17:47:16 +02:00 · 3885b04a2a
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@ -1738,7 +1738,7 @@
        <parameter name="textboxUserValue"/>
        <body><![CDATA[
          if (!this.popup) {
-            return;
+            return false;
          }

          let stopEvent = false;