[Pkg-mozext-commits] [tabmixplus] 36/44: [e10s] Move getNodeWithOnClick to LinkNodeUtils.jsm

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 2a1e4cebf258f7942b4edcfbef6aa3163dcabe85
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sun Oct 12 16:22:35 2014 +0300

    [e10s] Move getNodeWithOnClick to LinkNodeUtils.jsm
---
 chrome/content/content.js | 16 +---------------
 modules/ContentClick.jsm  | 16 +---------------
 modules/LinkNodeUtils.jsm | 12 ++++++++++++
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/chrome/content/content.js b/chrome/content/content.js
index 1224453..b48dba7 100644
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -101,7 +101,7 @@ let TabmixClickEventHandler = {
 
     // see getHrefFromNodeOnClick in tabmix's ContentClick.jsm
     // for the case there is no href
-    let linkNode = href ? node : this._getNodeWithOnClick(event);
+    let linkNode = href ? node : LinkNodeUtils.getNodeWithOnClick(event.target);
     if (linkNode)
       linkNode = LinkNodeUtils.wrap(linkNode, this._focusedWindow,
                                          href && event.button == 0);
@@ -195,20 +195,6 @@ let TabmixClickEventHandler = {
     let focusedWindow = {};
     let elt = fm.getFocusedElementForWindow(content, true, focusedWindow);
     return focusedWindow.value;
-  },
-
-  _getNodeWithOnClick: function(event) {
-    // for safety reason look only 3 level up
-    let i = 0, node = event.target;
-    while (i < 3 && node && node.hasAttribute && !node.hasAttribute("onclick")) {
-      node = node.parentNode;
-      i++;
-    }
-
-    if (node && node.hasAttribute && node.hasAttribute("onclick"))
-      return node;
-
-    return null;
   }
 };
 
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index ba6384b..e4e3c61 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -434,7 +434,7 @@ let ContentClickInternal = {
     let win = aBrowser.ownerDocument.defaultView;
     let [href, linkNode] = win.hrefAndLinkNodeForClickEvent(aEvent);
     if (!href) {
-      let node = this._getNodeWithOnClick(aEvent);
+      let node = LinkNodeUtils.getNodeWithOnClick(aEvent.target);
       let wrappedOnClickNode = this.getWrappedNode(node, aFocusedWindow, aEvent.button == 0);
       if (this.getHrefFromNodeOnClick(aEvent, aBrowser, wrappedOnClickNode))
         aEvent.preventDefault();
@@ -1078,20 +1078,6 @@ let ContentClickInternal = {
       return;
 
     result.__hrefFromOnClick = newHref;
-  },
-
-  _getNodeWithOnClick: function(event) {
-    // for safety reason look only 3 level up
-    let i = 0, node = event.target;
-    while (i < 3 && node && node.hasAttribute && !node.hasAttribute("onclick")) {
-      node = node.parentNode;
-      i++;
-    }
-
-    if (node && node.hasAttribute && node.hasAttribute("onclick"))
-      return node;
-
-    return null;
   }
 }
 
diff --git a/modules/LinkNodeUtils.jsm b/modules/LinkNodeUtils.jsm
index 1544970..abff011 100644
--- a/modules/LinkNodeUtils.jsm
+++ b/modules/LinkNodeUtils.jsm
@@ -62,6 +62,18 @@ this.LinkNodeUtils = {
     if (getTargetIsFrame)
       wrapper.targetIsFrame = targetIsFrame(wrapper.target, focusedWindow);
     return wrapper;
+  },
+
+  getNodeWithOnClick: function(node) {
+    // for safety reason look only 3 level up
+    let i = 0;
+    while (i < 3 && node && node.hasAttribute && !node.hasAttribute("onclick")) {
+      node = node.parentNode;
+      i++;
+    }
+    if (node && node.hasAttribute && node.hasAttribute("onclick"))
+      return node;
+    return null;
   }
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git