Fix view source toggle when inside a frame.

2 files changed, 13 insertions, 2 deletions

diff --git a/background_page.html b/background_page.html
index 4133a023..1efd6ae0 100644
--- a/background_page.html
+++ b/background_page.html
@@ -66,6 +66,7 @@
   var sendRequestHandlers = {
     getCompletionKeys: getCompletionKeys,
     getLinkHintCss: getLinkHintCss,
+    openUrlInCurrentTab: openUrlInCurrentTab,
     openOptionsPageInNewTab: openOptionsPageInNewTab,
     upgradeNotificationClosed: upgradeNotificationClosed,
     updateScrollPosition: handleUpdateScrollPosition
@@ -219,6 +220,15 @@
     return {completionKeys: generateCompletionKeys()};
   }
 
+  /**
+    * Opens the url in the current tab.
+    */
+   function openUrlInCurrentTab(request) {
+     chrome.tabs.getSelected(null, function(tab) {
+       chrome.tabs.update(tab.id, {url: request.url});
+     });
+   }
+
   /*
    * Returns the core CSS used for link hints, along with any user-provided overrides.
    */
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 226c7953..331e9afe 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -238,9 +238,10 @@ function copyCurrentUrl() {
 function toggleViewSourceCallback(url) {
   if (url.substr(0, 12) == "view-source:")
   {
-    window.location.href = url.substr(12, url.length - 12);
+    url = url.substr(12, url.length - 12);
   }
-  else { window.location.href = "view-source:" + url; }
+  else { url = "view-source:" + url; }
+  chrome.extension.sendRequest({handler: "openUrlInCurrentTab", url:url});
 }
 
 /**