allow clicked links in external nav windows to be opened in same window

jmcphers · jmcphers · commit 7e9ef3035795 · 2015-06-30T15:24:38.000-07:00
diff --git a/src/cpp/desktop/DesktopWebPage.cpp b/src/cpp/desktop/DesktopWebPage.cpp
@@ -231,15 +231,18 @@ bool WebPage::acceptNavigationRequest(QWebFrame* pWebFrame,
       {
          handleBase64Download(pWebFrame, url);
       }
-      else if (navType == QWebPage::NavigationTypeLinkClicked)
-      {
-         desktop::openUrl(url);
-      }
       else if (allowExternalNav_)
       {
+         // if allowing external navigation, follow this (even if a link click)
          navigated_ = true;
          return true;
       }
+      else if (navType == QWebPage::NavigationTypeLinkClicked)
+      {
+         // when not allowing external navigation, open an external browser
+         // to view the URL
+         desktop::openUrl(url);
+      }
 
       if (!navigated_)
          this->view()->window()->deleteLater();

Original file line number	Diff line number	Diff line change
`@@ -231,15 +231,18 @@ bool WebPage::acceptNavigationRequest(QWebFrame* pWebFrame,`
`231`	`231`	`{`
`232`	`232`	`handleBase64Download(pWebFrame, url);`
`233`	`233`	`}`
`234`		`- else if (navType == QWebPage::NavigationTypeLinkClicked)`
`235`		`- {`
`236`		`- desktop::openUrl(url);`
`237`		`- }`
`238`	`234`	`else if (allowExternalNav_)`
`239`	`235`	`{`
	`236`	`+ // if allowing external navigation, follow this (even if a link click)`
`240`	`237`	`navigated_ = true;`
`241`	`238`	`return true;`
`242`	`239`	`}`
	`240`	`+ else if (navType == QWebPage::NavigationTypeLinkClicked)`
	`241`	`+ {`
	`242`	`+ // when not allowing external navigation, open an external browser`
	`243`	`+ // to view the URL`
	`244`	`+ desktop::openUrl(url);`
	`245`	`+ }`
`243`	`246`
`244`	`247`	`if (!navigated_)`
`245`	`248`	`this->view()->window()->deleteLater();`