Skip to content

Commit 85d2ee9

Browse files
committed
export: allow local file remote access
1 parent b0b5157 commit 85d2ee9

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

src/widgets/editors/markdownviewer.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <QApplication>
77
#include <QMimeData>
88
#include <QScopedPointer>
9+
#include <QWebEngineSettings>
910

1011
#include "markdownvieweradapter.h"
1112
#include "previewhelper.h"
@@ -70,6 +71,8 @@ MarkdownViewer::MarkdownViewer(MarkdownViewerAdapter *p_adapter,
7071
mimeData->setHtml(p_html);
7172
ClipboardUtils::setMimeDataToClipboard(QApplication::clipboard(), mimeData.release());
7273
});
74+
75+
settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, true);
7376
}
7477

7578
MarkdownViewerAdapter *MarkdownViewer::adapter() const

src/widgets/markdownviewwindow.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,6 @@ void MarkdownViewWindow::setupViewer()
508508
setEditViewMode(m_editViewMode);
509509
}
510510
});
511-
512-
m_viewer->settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, true);
513511
}
514512

515513
void MarkdownViewWindow::syncTextEditorFromBuffer(bool p_syncPositionFromReadMode)

src/widgets/webpage.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "webpage.h"
22

3+
#include <QDebug>
4+
35
#include <utils/widgetutils.h>
46
#include <core/vnotex.h>
57
#include <core/fileopenparameters.h>
@@ -35,3 +37,14 @@ bool WebPage::acceptNavigationRequest(const QUrl &p_url,
3537
WidgetUtils::openUrlByDesktop(p_url);
3638
return false;
3739
}
40+
41+
void WebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level,
42+
const QString &message,
43+
int lineNumber,
44+
const QString &sourceID)
45+
{
46+
if (level == QWebEnginePage::InfoMessageLevel) {
47+
qDebug() << "JS(" << sourceID << ":" << lineNumber << "):" << message;
48+
}
49+
QWebEnginePage::javaScriptConsoleMessage(level, message, lineNumber, sourceID);
50+
}

src/widgets/webpage.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ namespace vnotex
1515
bool acceptNavigationRequest(const QUrl &p_url,
1616
NavigationType p_type,
1717
bool p_isMainFrame) Q_DECL_OVERRIDE;
18+
19+
void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level,
20+
const QString &message,
21+
int lineNumber,
22+
const QString &sourceID) override;
1823
};
1924
}
2025

0 commit comments

Comments
 (0)