[Pkg-mozext-commits] [tabmixplus] 35/147: Follow up bug 1315948 - Simplify openLinkIn in utilityOverlay.js

[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 81f7e29359a1910402a670d5d15cd7fb2f3c0578
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Nov 29 16:03:13 2016 +0200

    Follow up bug 1315948 - Simplify openLinkIn in utilityOverlay.js
---
 chrome/content/places/places.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/chrome/content/places/places.js b/chrome/content/places/places.js
index 08cef05..41da8ac 100644
--- a/chrome/content/places/places.js
+++ b/chrome/content/places/places.js
@@ -738,14 +738,19 @@ Tabmix.onContentLoaded = {
     )._replace(
       'where == "current" && #1.pinned'
         .replace("#1", Tabmix.isVersion(520) ? "tab" : "w.gBrowser.selectedTab"),
-      '$& && !params.suppressTabsOnFileDownload'
+      '$& && !params.suppressTabsOnFileDownload',
+      {check: !Tabmix.isVersion(530)}
     )._replace(
-      'var w = getTopWin();',
-      '$&\n' +
-      '  if (w && where == "window" &&\n' +
+      '(targetBrowser).pinned',
+      '$& && !params.suppressTabsOnFileDownload',
+      {check: Tabmix.isVersion(530)}
+    )._replace(
+      'if ((where == "tab" ||',
+      'if (w && where == "window" &&\n' +
       '      !Tabmix.isNewWindowAllow(aIsPrivate)) {\n' +
       '    where = "tab";\n' +
-      '  }'
+      '  }\n' +
+      '  $&'
     )._replace(
       /Services.ww.openWindow[^;]*;/,
       'let newWin = $&\n' +

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