From fe3bed3869a1278cc274d67c1c34605d9a498140 Mon Sep 17 00:00:00 2001 From: Teus Benschop Date: Tue, 2 Oct 2018 14:12:36 +0200 Subject: New upstream version 2.11.2 --- src/frontend/display/bthtml.js | 5 +++++ src/frontend/display/bthtmljsobject.cpp | 3 --- src/frontend/display/btwebengine.js | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/frontend/display') diff --git a/src/frontend/display/bthtml.js b/src/frontend/display/bthtml.js index 79bffde..ec174d8 100644 --- a/src/frontend/display/bthtml.js +++ b/src/frontend/display/bthtml.js @@ -82,6 +82,8 @@ function mouseMoveHandler (mEvent) if (node.attributes.length > 0) { attribList = getNodeAttributes(node); + if (attribList == "") + attribList = getNodeAttributes(node.parentNode); btHtmlJsObject.mouseMoveEvent(attribList, x, y, shiftKey); } } @@ -115,6 +117,9 @@ function timerEvent() if (currentNode != 0 && currentNode == prevNode) { var attributes = getNodeAttributes(currentNode); + if ( + attributes == "") + attributes = getNodeAttributes(currentNode.parentNode); btHtmlJsObject.timeOutEvent(attributes); } } diff --git a/src/frontend/display/bthtmljsobject.cpp b/src/frontend/display/bthtmljsobject.cpp index b2407e3..b09e1b4 100644 --- a/src/frontend/display/bthtmljsobject.cpp +++ b/src/frontend/display/bthtmljsobject.cpp @@ -114,9 +114,6 @@ void BtHtmlJsObject::mouseMoveEvent(const QString& attributes, const int& x, con // called from javascript timerEvent() in bthtml.js void BtHtmlJsObject::timeOutEvent(const QString & attributes) { - if (m_prev_attributes != attributes) - return; - m_prev_attributes = ""; Rendering::ListInfoData infoList(Rendering::detectInfo(attributes)); diff --git a/src/frontend/display/btwebengine.js b/src/frontend/display/btwebengine.js index f0bdfb3..b36080a 100644 --- a/src/frontend/display/btwebengine.js +++ b/src/frontend/display/btwebengine.js @@ -82,6 +82,8 @@ function mouseMoveHandler (mEvent) if (node.attributes.length > 0) { attribList = getNodeAttributes(node); + if (attribList == "") + attribList = getNodeAttributes(node.parentNode); btHtmlJsObject.mouseMoveEvent(attribList, x, y, shiftKey); } } @@ -116,6 +118,8 @@ function timerEvent() if (currentNode != 0 && currentNode == prevNode) { var attributes = getNodeAttributes(currentNode); + if (attributes == "") + attributes = getNodeAttributes(currentNode.parentNode); btHtmlJsObject.timeOutEvent(attributes); } } -- cgit v1.2.3