diff --git a/chrome/content/composer.js b/chrome/content/composer.js
index 06cae51..bedd66c 100644
--- a/chrome/content/composer.js
+++ b/chrome/content/composer.js
@@ -135,11 +135,6 @@ function init() {
typeGroup.appendChild(typeNode);
}
- let collapseDefault = E("collapseDefault");
- collapseDefault.label = collapseDefault.getAttribute(aup.prefs.fastcollapse ? "label_no" : "label_yes");
- E("collapse").value = "";
- E("collapse").setAttribute("label", collapseDefault.label);
-
updatePatternSelection();
document.getElementById("disabledWarning").hidden = aup.prefs.enabled;
@@ -184,10 +179,7 @@ function updateFilter()
if (E("matchCase").checked)
options.push("match-case");
- let collapse = E("collapse");
- disableElement(collapse, type == "whitelist", "value", "");
- if (collapse.value != "")
- options.push(collapse.value);
+ disableElement(false, type == "whitelist", "value", "");
let enabledTypes = [];
let disabledTypes = [];
diff --git a/chrome/content/composer.xul b/chrome/content/composer.xul
index d83a1d1..3ffb41d 100644
--- a/chrome/content/composer.xul
+++ b/chrome/content/composer.xul
@@ -103,16 +103,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/chrome/content/filterClasses.js b/chrome/content/filterClasses.js
index 78754b1..21ff7e3 100644
--- a/chrome/content/filterClasses.js
+++ b/chrome/content/filterClasses.js
@@ -378,7 +378,6 @@ RegExpFilter.fromText = function(text)
let matchCase = null;
let domains = null;
let thirdParty = null;
- let collapse = null;
let options;
if (Filter.optionsRegExp.test(text))
{
@@ -409,10 +408,6 @@ RegExpFilter.fromText = function(text)
thirdParty = true;
else if (option == "~THIRD_PARTY")
thirdParty = false;
- else if (option == "COLLAPSE")
- collapse = true;
- else if (option == "~COLLAPSE")
- collapse = false;
}
}
@@ -445,7 +440,7 @@ RegExpFilter.fromText = function(text)
try
{
- return new constructor(origText, regexp, contentType, matchCase, domains, thirdParty, collapse);
+ return new constructor(origText, regexp, contentType, matchCase, domains, thirdParty, false);
}
catch (e)
{
@@ -481,25 +476,17 @@ RegExpFilter.typeMap = {
* @param {Boolean} matchCase see RegExpFilter()
* @param {String} domains see RegExpFilter()
* @param {Boolean} thirdParty see RegExpFilter()
- * @param {Boolean} collapse defines whether the filter should collapse blocked content, can be null
* @constructor
* @augments RegExpFilter
*/
-function BlockingFilter(text, regexp, contentType, matchCase, domains, thirdParty, collapse)
+function BlockingFilter(text, regexp, contentType, matchCase, domains, thirdParty, false)
{
RegExpFilter.call(this, text, regexp, contentType, matchCase, domains, thirdParty);
-
- this.collapse = collapse;
}
BlockingFilter.prototype =
{
- __proto__: RegExpFilter.prototype,
-
- /**
- * Defines whether the filter should collapse blocked content. Can be null (use the global preference).
- * @type Boolean
- */
- collapse: null
+ __proto__: RegExpFilter.prototype
+
};
aup.BlockingFilter = BlockingFilter;
diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
index 4a4106d..5f8fefe 100644
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -542,7 +542,6 @@ function aupFillPopup(popup) {
elements.enabled.setAttribute("checked", aupPrefs.enabled);
elements.frameobjects.setAttribute("checked", aupPrefs.frameobjects);
- elements.slowcollapse.setAttribute("checked", !aupPrefs.fastcollapse);
elements.showintoolbar.setAttribute("checked", aupPrefs.showintoolbar);
elements.showinstatusbar.setAttribute("checked", aupPrefs.showinstatusbar);
diff --git a/chrome/content/overlayGeneral.xul b/chrome/content/overlayGeneral.xul
index 6b2ffae..3d5bf52 100644
--- a/chrome/content/overlayGeneral.xul
+++ b/chrome/content/overlayGeneral.xul
@@ -57,7 +57,6 @@