Revert "gorhill#12"

This reverts commit 547a6c0.
geoffdutton · Dec 9, 2017 · 9985d78 · 9985d78
1 parent 547a6c0
commit 9985d78
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 32 deletions.
diff --git a/platform/chromium/options_ui.html b/platform/chromium/options_ui.html
@@ -4,8 +4,6 @@
 <meta charset="utf-8">
 <script src="js/vapi.js"></script>
 <script src="js/vapi-client.js"></script>
-<!-- Patch 2017-12-09: Properly fix dashboard opening handling -->
-<script src="js/vapi-nano.js"></script>
 <script src="js/options_ui.js"></script>
 <title></title>
 </head>

diff --git a/platform/chromium/vapi-client.js b/platform/chromium/vapi-client.js
@@ -433,6 +433,15 @@ vAPI.messaging.Connection.prototype = {
 
 /******************************************************************************/
 
+// Patch 2017-12-06: Replace the current tab
+vAPI.openHere = function(path) {
+    if ( chrome.tabs !== undefined ) {
+        chrome.tabs.update({ url: path });
+    }
+};
+
+/******************************************************************************/
+
 vAPI.shutdown.add(function() {
     vAPI.messaging.shutdown();
     window.vAPI = undefined;

diff --git a/platform/chromium/vapi-nano.js b/platform/chromium/vapi-nano.js
diff --git a/src/dashboard.html b/src/dashboard.html
@@ -26,8 +26,6 @@
 
 <script src="js/vapi.js"></script>
 <script src="js/vapi-common.js"></script>
-<!-- Patch 2017-12-09: Properly fix dashboard opening handling -->
-<script src="js/vapi-nano.js"></script>
 <script src="js/udom.js"></script>
 <script src="js/i18n.js"></script>
 <script src="js/dashboard.js"></script>

diff --git a/src/js/dashboard.js b/src/js/dashboard.js
@@ -80,11 +80,4 @@ uDom.onLoad(function() {
 
 /******************************************************************************/
 
-// Patch 2017-12-09: Make back button properly return to extension manager
-window.addEventListener('beforeunload', function() {
-    vAPI.openHere(vAPI.extensionManager);
-});
-
-/******************************************************************************/
-
 })();