From 474efd847b7fcb49f8623703004c859db1aed773 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 21 Apr 2015 13:01:40 -0700
Subject: [PATCH] Bug 1022765 - Ensure ESC opens the split console on first try
 in the inspector. r=pbrosset

---
 browser/devtools/markupview/markup-view.js | 2 +-
 browser/devtools/shared/widgets/Tooltip.js | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/browser/devtools/markupview/markup-view.js b/browser/devtools/markupview/markup-view.js
index adaaacb9847a..234b10281583 100644
--- a/browser/devtools/markupview/markup-view.js
+++ b/browser/devtools/markupview/markup-view.js
@@ -2162,7 +2162,7 @@ MarkupElementContainer.prototype = Heritage.extend(MarkupContainer.prototype, {
    */
   isImagePreviewTarget: function(target, tooltip) {
     if (!this.tooltipData || this.tooltipData.target !== target) {
-      return promise.reject();
+      return promise.reject(false);
     }
 
     return this.tooltipData.data.then(({data, size}) => {
diff --git a/browser/devtools/shared/widgets/Tooltip.js b/browser/devtools/shared/widgets/Tooltip.js
index abe8a818c856..977752e14ee2 100644
--- a/browser/devtools/shared/widgets/Tooltip.js
+++ b/browser/devtools/shared/widgets/Tooltip.js
@@ -453,8 +453,6 @@ Tooltip.prototype = {
     if (res && res.then) {
       return res.then(arg => {
         return arg instanceof Ci.nsIDOMNode ? arg : target;
-      }, () => {
-        return false;
       });
     } else {
       let newTarget = res instanceof Ci.nsIDOMNode ? res : target;