Mirror/jami-client-qt
1
0
Fork 0
mirror of https://github.com/savoirfairelinux/jami-client-qt.git synced 2025-12-18 08:35:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

chatview: fix webengine binding for msg linkify/preview mechanism

Browse Source 
This was broken in commit 3f88ced, as the webchannel js object can
not be used to invoke Qt signal methods directly. Wrapping with
an emitter method is required.

Change-Id: I8633a5693105efd928fb68f227fdf75c161371fe
Gitlab: #735
This commit is contained in:
Andreas Traczyk
2022-05-06 15:06:05 -04:00
parent 0000f05395
commit dcd4cad692
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/misc/previewInterop.js
View File

@@ -32,13 +32,13 @@ function getPreviewInfo(messageId, url) {
title = "Twitter. It's what's happening." title = "Twitter. It's what's happening."
} }
window.jsbridge.infoReady(messageId, { window.jsbridge.emitInfoReady(messageId, {
'title': title, 'title': title,
'image': image, 'image': image,
'description': description, 'description': description,
'url': url, 'url': url,
'domain': domain, 'domain': domain,
}) })
}).catch(function (err) { }).catch(function (err) {
log("Error occured while fetching document: " + err) log("Error occured while fetching document: " + err)
}) })
@@ -51,5 +51,5 @@ function parseMessage(messageId, message, showPreview) {
} }
if (showPreview) if (showPreview)
getPreviewInfo(messageId, links[0].href) getPreviewInfo(messageId, links[0].href)
window.jsbridge.linkifyReady(messageId, linkifyStr(message)) window.jsbridge.emitLinkified(messageId, linkifyStr(message))
} }

8
src/nowebengine/previewengine.cpp
View File

@@ -40,5 +40,13 @@ void
PreviewEngine::log(const QString&) PreviewEngine::log(const QString&)
{} {}
void
PreviewEngine::emitInfoReady(const QString&, const QVariantMap&)
{}
void
PreviewEngine::emitLinkified(const QString&, const QString&)
{}
#include "moc_previewengine.cpp" #include "moc_previewengine.cpp"
#include "previewengine.moc" #include "previewengine.moc"

12
src/previewengine.cpp
View File

@@ -96,5 +96,17 @@ PreviewEngine::log(const QString& str)
qDebug() << str; qDebug() << str;
} }
void
PreviewEngine::emitInfoReady(const QString& messageId, const QVariantMap& info)
{
Q_EMIT infoReady(messageId, info);
}
void
PreviewEngine::emitLinkified(const QString& messageId, const QString& linkifiedStr)
{
Q_EMIT linkified(messageId, linkifiedStr);
}
#include "moc_previewengine.cpp" #include "moc_previewengine.cpp"
#include "previewengine.moc" #include "previewengine.moc"

6
src/previewengine.h
View File

@@ -33,10 +33,12 @@ public:
void parseMessage(const QString& messageId, const QString& msg, bool showPreview); void parseMessage(const QString& messageId, const QString& msg, bool showPreview);
Q_INVOKABLE void log(const QString& str); Q_INVOKABLE void log(const QString& str);
Q_INVOKABLE void emitInfoReady(const QString& messageId, const QVariantMap& info);
Q_INVOKABLE void emitLinkified(const QString& messageId, const QString& linkifiedStr);
Q_SIGNALS: Q_SIGNALS:
Q_INVOKABLE void infoReady(const QString& messageId, const QVariantMap& info); void infoReady(const QString& messageId, const QVariantMap& info);
Q_INVOKABLE void linkified(const QString& messageId, const QString& linkified); void linkified(const QString& messageId, const QString& linkifiedStr);
private: private:
struct Impl; struct Impl;