diff options
| author | Teus Benschop <teusjannette@gmail.com> | 2018-10-02 14:12:36 +0200 |
|---|---|---|
| committer | Teus Benschop <teusjannette@gmail.com> | 2018-10-02 14:12:36 +0200 |
| commit | fe3bed3869a1278cc274d67c1c34605d9a498140 (patch) | |
| tree | c581beefe76d6d57358e4756923a3de506c7c5a5 /src/frontend/display | |
| parent | 6ca84db1f51ce1a5eea260ddf1be7dd99437ce7e (diff) | |
New upstream version 2.11.2
Diffstat (limited to 'src/frontend/display')
| -rw-r--r-- | src/frontend/display/bthtml.js | 5 | ||||
| -rw-r--r-- | src/frontend/display/bthtmljsobject.cpp | 3 | ||||
| -rw-r--r-- | src/frontend/display/btwebengine.js | 4 |
3 files changed, 9 insertions, 3 deletions
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); } } |