wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 815120 - xpinstall.enabled=false still allows to install xpi via. addon search. r=Unfocused

Browse Source
This commit is contained in:
Martin Stransky 2013-08-19 08:49:42 -04:00
parent 0761259943
commit db5194e591
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolkit/mozapps/extensions/content/extensions.js
View File

@ -2085,6 +2085,9 @@ var gSearchView = {
this._emptyNotice = document.getElementById("search-list-empty"); this._emptyNotice = document.getElementById("search-list-empty");
this._allResultsLink = document.getElementById("search-allresults-link"); this._allResultsLink = document.getElementById("search-allresults-link");
if (!AddonManager.isInstallEnabled("application/x-xpinstall"))
this._filter.hidden = true;
var self = this; var self = this;
this._listBox.addEventListener("keydown", function listbox_onKeydown(aEvent) { this._listBox.addEventListener("keydown", function listbox_onKeydown(aEvent) {
if (aEvent.keyCode == aEvent.DOM_VK_ENTER || if (aEvent.keyCode == aEvent.DOM_VK_ENTER ||
@ -2226,6 +2229,10 @@ var gSearchView = {
updateView: function gSearchView_updateView() { updateView: function gSearchView_updateView() {
var showLocal = this._filter.value == "local"; var showLocal = this._filter.value == "local";
if (!showLocal && !AddonManager.isInstallEnabled("application/x-xpinstall"))
showLocal = true;
this._listBox.setAttribute("local", showLocal); this._listBox.setAttribute("local", showLocal);
this._listBox.setAttribute("remote", !showLocal); this._listBox.setAttribute("remote", !showLocal);

39
toolkit/mozapps/extensions/test/browser/browser_searching.js
View File

@ -335,8 +335,10 @@ function check_results(aQuery, aSortBy, aReverseOrder, aShowLocal) {
* How the results are sorted (e.g. "name") * How the results are sorted (e.g. "name")
* @param aReverseOrder * @param aReverseOrder
* Boolean representing if the results are in reverse default order * Boolean representing if the results are in reverse default order
* @param aLocalOnly
* Boolean representing if the results are local only, can be undefined
*/ */
function check_filtered_results(aQuery, aSortBy, aReverseOrder) { function check_filtered_results(aQuery, aSortBy, aReverseOrder, aLocalOnly) {
var localFilter = gManagerWindow.document.getElementById("search-filter-local"); var localFilter = gManagerWindow.document.getElementById("search-filter-local");
var remoteFilter = gManagerWindow.document.getElementById("search-filter-remote"); var remoteFilter = gManagerWindow.document.getElementById("search-filter-remote");
@ -348,8 +350,9 @@ function check_filtered_results(aQuery, aSortBy, aReverseOrder) {
check_results(aQuery, aSortBy, aReverseOrder, true); check_results(aQuery, aSortBy, aReverseOrder, true);
// Check with showing remote add-ons // Check with showing remote add-ons
aLocalOnly = aLocalOnly || false;
EventUtils.synthesizeMouseAtCenter(remoteFilter, { }, gManagerWindow); EventUtils.synthesizeMouseAtCenter(remoteFilter, { }, gManagerWindow);
check_results(aQuery, aSortBy, aReverseOrder, false); check_results(aQuery, aSortBy, aReverseOrder, aLocalOnly);
} }
/* /*
@ -647,3 +650,35 @@ add_test(function() {
}); });
}); });
function bug_815120_test_search(aLocalOnly) {
restart_manager(gManagerWindow, "addons://list/extension", function(aWindow) {
gManagerWindow = aWindow;
gCategoryUtilities = new CategoryUtilities(gManagerWindow);
// Installed add-on is considered local on new search
gAddonInstalled = true;
// Check the search setup
if (aLocalOnly) {
var localFilterSelected = aWindow.document.getElementById("search-filter-local").selected;
ok(localFilterSelected, "Local filter should be selected if remote plugin installation is disabled");
}
var remoteFilterButton = aWindow.document.getElementById("search-filter-remote");
is(aLocalOnly, is_hidden(remoteFilterButton), "Remote filter button visibility does not match, aLocalOnly = " + aLocalOnly);
search(QUERY, false, function() {
check_filtered_results(QUERY, "relevancescore", false, aLocalOnly);
run_next_test();
});
});
}
// Tests for Bug 815120
add_test(function() {
Services.prefs.setBoolPref(PREF_XPI_ENABLED, false);
bug_815120_test_search(true);
});
add_test(function() {
Services.prefs.setBoolPref(PREF_XPI_ENABLED, true);
bug_815120_test_search(false);
});