Merge pull request #1246 from kiwix/Bugfix-toc-switch-tab

BugFix: Prevent crashes from tab switches due to Table Of Content
kiwix · Nov 14, 2024 · 1a0580d · 1a0580d
2 parents 0beea2d + b5d3ff0
commit 1a0580d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/resources/js/headerAnchor.js b/resources/js/headerAnchor.js
@@ -31,7 +31,7 @@ function anchorHeaderElements(headers)
     });
 }
 
-function getHeaders()
+function getHeadersJSONStr()
 {
     const headerInfo = { url: window.location.href.replace(location.hash,""), headers: [] };
 
@@ -40,12 +40,12 @@ function getHeaders()
         const headers = getDOMElementsPreorderDFS(document.body, isHeaderElement);
         headerInfo.headers = anchorHeaderElements(headers);
     }
-    return headerInfo;
+    return JSON.stringify(headerInfo);
 }
 
 new QWebChannel(qt.webChannelTransport, function(channel) {
     var kiwixObj = channel.objects.kiwixChannelObj;
-    kiwixObj.sendHeaders(getHeaders());
+    kiwixObj.sendHeadersJSONStr(getHeadersJSONStr());
     kiwixObj.navigationRequested.connect(function(url, anchor) {
         if (window.location.href.replace(location.hash,"") == url)
             document.getElementById(anchor).scrollIntoView();

diff --git a/src/kiwixwebchannelobject.h b/src/kiwixwebchannelobject.h
@@ -10,10 +10,10 @@ class KiwixWebChannelObject : public QObject
 public:
     explicit KiwixWebChannelObject(QObject *parent = nullptr) : QObject(parent) {};
 
-    Q_INVOKABLE void sendHeaders(const QJsonObject& headers) { emit headersChanged(headers); };
+    Q_INVOKABLE void sendHeadersJSONStr(const QString& headersJSONStr) { emit headersChanged(headersJSONStr); };
 
 signals:
-    void headersChanged(const QJsonObject& headers);
+    void headersChanged(const QString& headersJSONStr);
     void navigationRequested(const QString& url, const QString& anchor);
 };
 

diff --git a/src/tableofcontentbar.cpp b/src/tableofcontentbar.cpp
@@ -85,8 +85,11 @@ void createSubTree(QTreeWidgetItem* parent, QString parentNo, QJsonArray& header
 
 void TableOfContentBar::setupTree(const QJsonObject& headers)
 {
-    const auto headerUrl = headers["url"].toString();
     const auto webView = KiwixApp::instance()->getTabWidget()->currentWebView();
+    if (!webView)
+        return;
+
+    const auto headerUrl = headers["url"].toString();
     const auto currentUrl = webView->url().url(QUrl::RemoveFragment);
     if (headerUrl != currentUrl)
         return;

diff --git a/src/webview.cpp b/src/webview.cpp
@@ -221,10 +221,10 @@ void WebView::onCurrentTitleChanged()
         emit headersChanged(m_headers);
 }
 
-void WebView::onHeadersReceived(const QJsonObject& headers)
+void WebView::onHeadersReceived(const QString& headersJSONStr)
 {
     const auto tabbar = KiwixApp::instance()->getTabWidget();
-    m_headers = QJsonObject(headers);
+    m_headers = QJsonDocument::fromJson(headersJSONStr.toUtf8()).object();
 
     if (tabbar->currentWebView() == this)
         emit headersChanged(m_headers);

diff --git a/src/webview.h b/src/webview.h
@@ -71,7 +71,7 @@ public slots:
 private slots:
     void gotoTriggeredHistoryItemAction();
     void onCurrentTitleChanged();
-    void onHeadersReceived(const QJsonObject& headers);
+    void onHeadersReceived(const QString& headersJSONStr);
     void onNavigationRequested(const QString& url, const QString& anchor);
 
 private: