[Pkg-mozext-commits] [tabmixplus] 46/56: Don't disable inverse focus preferences when 'Middle-click or Control-click opens items in current tab' is on. The inverse preferences controls not only links

[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 733dbd0c2d42579769de6572fcdef3018364efe1
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri May 20 09:52:12 2016 +0300

    Don't disable inverse focus preferences when 'Middle-click or Control-click opens items in current tab' is on. The inverse preferences controls not only links
---
 chrome/content/preferences/events.js  | 7 -------
 chrome/content/preferences/events.xul | 9 ++-------
 chrome/content/preferences/links.xul  | 3 +--
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/chrome/content/preferences/events.js b/chrome/content/preferences/events.js
index a0955a6..c1dd272 100644
--- a/chrome/content/preferences/events.js
+++ b/chrome/content/preferences/events.js
@@ -21,8 +21,6 @@ var gEventsPane = {
       gPrefWindow.removeChild("ctrltab.tabPreviews");
     }
 
-    this.disableInverseMiddleClick();
-
     let newTabUrl = $("pref_newTabUrl");
     newTabUrl.name = TabmixSvc.newtabUrl;
     newTabUrl.value = newTabUrl.valueFromPreferences;
@@ -107,11 +105,6 @@ var gEventsPane = {
     }
   },
 
-  disableInverseMiddleClick: function() {
-    var val = ($("pref_opentabforLinks") || $("pref_opentabforLinks1")).value;
-    gPrefWindow.setDisabled("inverselinks", val != 2 && $("midcurrent").checked);
-  },
-
   editSlideShowKey: function() {
     document.documentElement.showPane($("paneMenu"));
     if (typeof gMenuPane == "object")
diff --git a/chrome/content/preferences/events.xul b/chrome/content/preferences/events.xul
index c41ed49..3ca45e3 100644
--- a/chrome/content/preferences/events.xul
+++ b/chrome/content/preferences/events.xul
@@ -41,8 +41,7 @@
                   type="bool" inverted="true"/>
       <preference id="pref_openSearch"          name="browser.search.openintab"               type="bool"/>
       <preference id="pref_openHistory"         name="extensions.tabmix.opentabfor.history"   type="bool"/>
-      <preference id="pref_midcurrent"          name="extensions.tabmix.middlecurrent"        type="bool"
-                  onchange="gEventsPane.disableInverseMiddleClick();"/>
+      <preference id="pref_midcurrent"          name="extensions.tabmix.middlecurrent" type="bool"/>
       <preference id="pref_selectTab"           name="browser.tabs.loadInBackground"
                                                                               inverted="true" type="bool"
                   onchange="if (typeof gMenuPane == 'object') gMenuPane.setInverseLinkLabel();"/>
@@ -64,8 +63,6 @@
                   type="bool" inverted="true"/>
       <preference id="pref_selectBMKGroups"     name="extensions.tabmix.loadBookmarksGroupInBackground"
                   type="bool" inverted="true"/>
-      <preference id="pref_opentabforLinks1"            name="extensions.tabmix.opentabforLinks"      type="int"
-                  onchange="if (typeof gLinksPane == 'undefined') gEventsPane.disableInverseMiddleClick();"/>
       <preference id="pref_inverselinks"        name="extensions.tabmix.inversefocusLinks"    type="bool"/>
       <preference id="pref_inverseother"        name="extensions.tabmix.inversefocusOther"    type="bool"/>
       <preference id="pref_warnOnClose"         name="extensions.tabmix.tabs.warnOnClose"     type="bool"/>
@@ -243,8 +240,7 @@
                 <checkbox_tmp id="inverselinks" label="&selectTab.label;" preference="pref_inverselinks"/>
               </vbox>
               <checkbox_tmp id="inverseother" label="&selectTabBH.label;, &openUrl.label;, &openSearch.label;"
-                        style="width: 19em;" align="start"
-                        preference="pref_inverseother" observes="obs_midcurrent"/>
+                            style="width: 19em;" align="start" preference="pref_inverseother"/>
             </hbox>
           </groupbox>
         </tabpanel>
@@ -381,7 +377,6 @@
 
    <broadcasterset id="paneEvents:Broadcaster">
       <broadcaster id="obs_openTabNext"/>
-      <broadcaster id="obs_midcurrent" inverseDependency="true"/>
       <broadcaster id="obs_mergePopups"/>
       <broadcaster id="obs_closeOnMerge"/>
       <broadcaster id="obs_ctrltab"/>
diff --git a/chrome/content/preferences/links.xul b/chrome/content/preferences/links.xul
index 88d0cf4..cb6b253 100644
--- a/chrome/content/preferences/links.xul
+++ b/chrome/content/preferences/links.xul
@@ -25,8 +25,7 @@
       <preference id="pref_filetypeEnable"     name="extensions.tabmix.enablefiletype" type="bool"/>
       <preference id="pref_opentabforLinks"    name="extensions.tabmix.opentabforLinks" type="int"
                   notChecked="0"
-                  onchange="if (typeof gEventsPane == 'object') gEventsPane.disableInverseMiddleClick();
-                            gPrefWindow.setDisabled('obs_opentabforAllLinks', this.value == 1);"/>
+                  onchange="gPrefWindow.setDisabled('obs_opentabforAllLinks', this.value == 1);"/>
     </preferences>
 
     <tabbox>

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