FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #422, therefore do not use specific base URL for message preview

Browse Source
This commit is contained in:
Martin Rotter 2021-05-31 09:33:46 +02:00
parent e5685513f1
commit ad265dfbd6
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librssguard/gui/webviewer.cpp
View File

@ -53,9 +53,7 @@ WebPage* WebViewer::page() const {
} }
void WebViewer::displayMessage() { void WebViewer::displayMessage() {
setContent(m_messageContents.toUtf8(), "text/html", QUrl::fromUserInput(INTERNAL_URL_MESSAGE)); setHtml(m_messageContents /*, QUrl::fromUserInput(INTERNAL_URL_MESSAGE)*/);
//setHtml(m_messageContents, QUrl::fromUserInput(INTERNAL_URL_MESSAGE));
} }
bool WebViewer::increaseWebPageZoom() { bool WebViewer::increaseWebPageZoom() {

15
src/librssguard/network-web/webpage.cpp
View File

@ -62,13 +62,14 @@ bool WebPage::acceptNavigationRequest(const QUrl& url, NavigationType type, bool
return false; return false;
} }
if (url.host() == INTERNAL_URL_MESSAGE_HOST) { /*if (url.host() == INTERNAL_URL_MESSAGE_HOST) {
setHtml(view()->messageContents(), QUrl(INTERNAL_URL_MESSAGE)); setHtml(view()->messageContents(), QUrl(INTERNAL_URL_MESSAGE));
return true; return true;
} }
else { else {*/
return QWebEnginePage::acceptNavigationRequest(url, type, is_main_frame); return QWebEnginePage::acceptNavigationRequest(url, type, is_main_frame);
}
//}
} }
void WebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, void WebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message,