From 0c40677b58689351b23034712b16d131993d7dd9 Mon Sep 17 00:00:00 2001
From: Zalmoxisus <zalmoxisus@gmail.com>
Date: Tue, 18 Dec 2018 01:03:08 +0200
Subject: [PATCH] Better handling for opening the editor

---
 .../src/openFile.js                           | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/packages/redux-devtools-trace-monitor/src/openFile.js b/packages/redux-devtools-trace-monitor/src/openFile.js
index 9dac7ed1..252fcc8f 100644
--- a/packages/redux-devtools-trace-monitor/src/openFile.js
+++ b/packages/redux-devtools-trace-monitor/src/openFile.js
@@ -1,3 +1,5 @@
+const isFF = navigator.userAgent.indexOf('Firefox') !== -1;
+
 function openResource(fileName, lineNumber, stackFrame) {
   const adjustedLineNumber = Math.max(lineNumber - 1, 0);
   chrome.devtools.panels.openResource(fileName, adjustedLineNumber, (result) => {
@@ -12,6 +14,31 @@ function openResource(fileName, lineNumber, stackFrame) {
   });
 }
 
+function openAndCloseTab(url) {
+  chrome.tabs.create({ url }, tab => {
+    const removeTab = () => {
+      chrome.windows.onFocusChanged.removeListener(removeTab);
+      if (tab && tab.id) {
+        chrome.tabs.remove(tab.id, () => {
+          if(chrome.runtime.lastError) console.log(chrome.runtime.lastError); // eslint-disable-line no-console
+          else if (chrome.devtools && chrome.devtools.inspectedWindow) {
+            chrome.tabs.update(chrome.devtools.inspectedWindow.tabId, {active: true});
+          }  
+        });
+      }
+    };
+    if (chrome.windows) chrome.windows.onFocusChanged.addListener(removeTab);
+  });
+}
+
+function openInIframe(url) {
+  const iframe = document.createElement('iframe');
+  iframe.src = url;
+  iframe.style = 'display:none';
+  document.body.appendChild(iframe);
+  setTimeout(() => iframe.parentNode.removeChild(iframe), 3000);
+}
+
 function openInEditor(editor, path, stackFrame) {
   const projectPath = path.replace(/\/$/, '');
   const file = stackFrame._originalFileName || stackFrame.finalFileName || stackFrame.fileName || '';
@@ -32,13 +59,17 @@ function openInEditor(editor, path, stackFrame) {
       url = `${editor}://open/?url=file://${projectPath}${filePath}&line=${line}&column=${column}`;
   }
   if (process.env.NODE_ENV === 'development') console.log(url); // eslint-disable-line no-console
-  window.open(url);
+  if (chrome.devtools && !isFF) {
+    if (chrome.tabs) openAndCloseTab(url);
+    else window.open(url);
+  } else {
+    openInIframe(url);
+  }
 }
 
 export default function openFile(fileName, lineNumber, stackFrame) {
   if (process.env.NODE_ENV === 'development') console.log(fileName, lineNumber, stackFrame); // eslint-disable-line no-console
   if (!chrome || !chrome.storage) return; // TODO: Pass editor settings for using outside of browser extension
-  const isFF = navigator.userAgent.indexOf('Firefox') !== -1;
   const storage = isFF ? chrome.storage.local : chrome.storage.sync || chrome.storage.local;
   storage.get(['useEditor', 'editor', 'projectPath'], function({ useEditor, editor, projectPath }) {
     if (useEditor && projectPath && typeof editor === 'string' && /^\w{1,30}$/.test(editor)) {