[Pkg-mozext-commits] [tabmixplus] 42/123: Don't check call isUrlForDownload for url when 'extensions.tabmix.enablefiletype' preference is off. remove download.asp from 'extensions.tabmix.filetype' preference

[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 d036ad005557b7dabff3c02dd51488eb440ec39d
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Aug 25 15:37:27 2014 +0300

    Don't check call isUrlForDownload for url when 'extensions.tabmix.enablefiletype' preference is off.
    remove download.asp from 'extensions.tabmix.filetype' preference
---
 defaults/preferences/tabmix.js | 2 +-
 modules/ContentClick.jsm       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/defaults/preferences/tabmix.js b/defaults/preferences/tabmix.js
index dbac4d1..0c828f8 100644
--- a/defaults/preferences/tabmix.js
+++ b/defaults/preferences/tabmix.js
@@ -217,7 +217,7 @@ pref("extensions.tabmix.middleclickDelete", true);
 pref("extensions.tabmix.optionsToolMenu", true);
 
 pref("extensions.tabmix.enablefiletype", true);
-pref("extensions.tabmix.filetype", "xpi zip rar exe tar jar gzip gz ace bin doc docx xls xlsx mdb ppt iso 7z cab arj lzh uue torrent /&disp=attd&/ php\?attachmentid=.* php\?act=Attach&type=post&id=.* /download.(php|asp)\?*/");
+pref("extensions.tabmix.filetype", "xpi zip rar exe tar jar gzip gz ace bin doc docx xls xlsx mdb ppt iso 7z cab arj lzh uue torrent /&disp=attd&/ php\?attachmentid=.* php\?act=Attach&type=post&id=.* /download.php\?*/");
 
 pref("extensions.{dc572301-7619-498c-a57d-39143191b318}.description", "chrome://tabmixplus/locale/tabmix.properties");
 
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index 2e8874d..4f3e1d0 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -45,7 +45,9 @@ this.TabmixContentClick = {
   },
 
   isUrlForDownload: function(url) {
-    return ContentClickInternal.isUrlForDownload(url);
+    if (TabmixSvc.prefBranch.getBoolPref("enablefiletype"))
+      return ContentClickInternal.isUrlForDownload(url);
+    return false;
   },
 
   selectExistingTab: function(href, targetAttr) {

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