mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 392140 - Remove TYPE_PLUGIN from the extension manager. r=bsmedberg

This commit is contained in:
rob_strong@exchangecode.com 2007-08-16 14:14:51 -07:00
Родитель 56c1fe60b8
Коммит a7a6f5232c
6 изменённых файлов: 21 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/base/content/safeMode.js
Просмотреть файл

@ -82,8 +82,7 @@ function disableAddons() {
const nsIUpdateItem = Components.interfaces.nsIUpdateItem;
var em = Components.classes["@mozilla.org/extensions/manager;1"]
.getService(Components.interfaces.nsIExtensionManager);
var type = nsIUpdateItem.TYPE_EXTENSION + nsIUpdateItem.TYPE_LOCALE +
nsIUpdateItem.TYPE_PLUGIN;
var type = nsIUpdateItem.TYPE_EXTENSION + nsIUpdateItem.TYPE_LOCALE;
var items = em.getItemList(type, { });
for (var i = 0; i < items.length; ++i)
em.disableItem(items[i].id);

27
toolkit/mozapps/extensions/content/extensions.js
Просмотреть файл

@ -284,16 +284,16 @@ function showView(aView) {
var showContinue = false;
switch (aView) {
case "extensions":
var types = [ [ ["type", nsIUpdateItem.TYPE_EXTENSION, "Integer" ] ] ];
var types = [ [ ["type", nsIUpdateItem.TYPE_EXTENSION, "Integer"] ] ];
break;
case "themes":
types = [ [ ["type", nsIUpdateItem.TYPE_THEME, "Integer" ] ] ];
types = [ [ ["type", nsIUpdateItem.TYPE_THEME, "Integer"] ] ];
break;
case "locales":
types = [ [ ["type", nsIUpdateItem.TYPE_LOCALE, "Integer" ] ] ];
types = [ [ ["type", nsIUpdateItem.TYPE_LOCALE, "Integer"] ] ];
break;
case "plugins":
types = [ [ ["type", nsIUpdateItem.TYPE_PLUGIN, "Integer" ] ] ];
types = [ [ ["plugin", "true", null] ] ];
break;
case "updates":
document.getElementById("updates-view").hidden = false;
@ -319,7 +319,7 @@ function showView(aView) {
["version", "?version"],
["typeName", "update"] ];
types = [ [ ["availableUpdateVersion", "?availableUpdateVersion", null],
[ "updateable", "true", null ] ] ];
["updateable", "true", null] ] ];
break;
case "installs":
document.getElementById("installs-view").hidden = false;
@ -357,7 +357,7 @@ function showView(aView) {
["version", "?version"],
["newVersion", "?newVersion"],
["typeName", "install"] ];
types = [ [ ["state", "?state", null ] ] ];
types = [ [ ["state", "?state", null] ] ];
break;
}
@ -563,10 +563,6 @@ function initPluginsDS()
rdf.GetResource(PREFIX_NS_EM + "compatible"),
rdf.GetLiteral("true"),
true);
gPluginsDS.Assert(pluginNode,
rdf.GetResource(PREFIX_NS_EM + "type"),
rdf.GetIntLiteral(nsIUpdateItem.TYPE_PLUGIN),
true);
gPluginsDS.Assert(pluginNode,
rdf.GetResource(PREFIX_NS_EM + "plugin"),
rdf.GetLiteral("true"),
@ -1097,7 +1093,7 @@ var gAddonContextMenus = ["menuitem_useTheme", "menuitem_options", "menuitem_hom
"menuitem_enable", "menuitem_disable"];
var gUpdateContextMenus = ["menuitem_homepage", "menuitem_about", "menuseparator_1",
"menuitem_installUpdate", "menuitem_includeUpdate"];
// For browsers don't display context menuitems that can open a browser window.
// For Firefox don't display context menuitems that can open a browser window.
var gUpdateContextMenusNoBrowser = ["menuitem_installUpdate", "menuitem_includeUpdate"];
var gInstallContextMenus = ["menuitem_homepage", "menuitem_about"];
@ -1170,6 +1166,9 @@ function buildContextMenu(aEvent)
document.getElementById("menuitem_disable_clone").hidden = canEnable;
document.getElementById("menuitem_useTheme_clone").hidden = true;
document.getElementById("menuitem_options_clone").hidden = true;
document.getElementById("menuitem_about_clone").hidden = true;
document.getElementById("menuitem_uninstall_clone").hidden = true;
document.getElementById("menuitem_checkUpdate_clone").hidden = true;
break;
case "updates":
var includeUpdate = document.getAnonymousElementByAttribute(selectedItem, "anonid", "includeUpdate");
@ -1406,17 +1405,14 @@ function updateOptionalViews() {
ctr.Init(ds, rdfs.GetResource(RDFURI_ITEM_ROOT));
var elements = ctr.GetElements();
var showLocales = false;
var showPlugins = false;
var showUpdates = false;
var showInstalls = false;
while (elements.hasMoreElements()) {
var e = elements.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
if (!showPlugins || !showLocales) {
if (!showLocales) {
var typeArc = rdfs.GetResource(PREFIX_NS_EM + "type");
var type = ds.GetTarget(e, typeArc, true);
if (type && type instanceof Components.interfaces.nsIRDFInt) {
if (type.Value & nsIUpdateItem.TYPE_PLUGIN)
showPlugins = true;
if (type.Value & nsIUpdateItem.TYPE_LOCALE)
showLocales = true;
}
@ -1444,7 +1440,6 @@ function updateOptionalViews() {
}
}
document.getElementById("locales-view").hidden = !showLocales;
document.getElementById("plugins-view").hidden = !showPlugins;
document.getElementById("updates-view").hidden = !showUpdates;
document.getElementById("installs-view").hidden = !showInstalls;
}

3
toolkit/mozapps/extensions/public/nsIExtensionManager.idl
Просмотреть файл

@ -522,9 +522,8 @@ interface nsIUpdateItem : nsISupports
const unsigned long TYPE_EXTENSION = 0x02;
const unsigned long TYPE_THEME = 0x04;
const unsigned long TYPE_LOCALE = 0x08;
const unsigned long TYPE_PLUGIN = 0x10;
const unsigned long TYPE_MULTI_XPI = 0x20;
const unsigned long TYPE_ADDON = TYPE_EXTENSION + TYPE_THEME + TYPE_LOCALE + TYPE_PLUGIN;
const unsigned long TYPE_ADDON = TYPE_EXTENSION + TYPE_THEME + TYPE_LOCALE;
const unsigned long TYPE_ANY = TYPE_APP + TYPE_ADDON;
/**

6
toolkit/mozapps/extensions/src/nsExtensionManager.js.in
Просмотреть файл

@ -3106,8 +3106,7 @@ ExtensionManager.prototype = {
// manifests, and are still valid, we need to manually create the flat
// manifest files.
var extensions = this._getActiveItems(nsIUpdateItem.TYPE_EXTENSION +
nsIUpdateItem.TYPE_LOCALE +
nsIUpdateItem.TYPE_PLUGIN);
nsIUpdateItem.TYPE_LOCALE);
for (var i = 0; i < extensions.length; ++i) {
var e = extensions[i];
var itemLocation = e.location.getItemLocation(e.id);
@ -3735,8 +3734,7 @@ ExtensionManager.prototype = {
// To do this we obtain a list of active extensions and themes and write
// these to the extensions.ini file in the profile directory.
var validExtensions = this._getActiveItems(nsIUpdateItem.TYPE_EXTENSION +
nsIUpdateItem.TYPE_LOCALE +
nsIUpdateItem.TYPE_PLUGIN);
nsIUpdateItem.TYPE_LOCALE);
var validThemes = this._getActiveItems(nsIUpdateItem.TYPE_THEME);
var extensionsLocationsFile = getFile(KEY_PROFILEDIR, [FILE_EXTENSION_MANIFEST]);

5
toolkit/themes/pinstripe/mozapps/extensions/extensions.css
Просмотреть файл

@ -185,12 +185,13 @@ richlistitem[opType="needs-disable"] .disableHide {
display: none;
}
richlistitem[plugin] .themeButton,
richlistitem[plugin] .optionsButton,
richlistitem[plugin] .uninstallButton,
richlistitem[type="2"] .themeButton,
richlistitem[type="8"] .themeButton,
richlistitem[type="16"] .themeButton,
richlistitem[type="4"] .optionsButton,
richlistitem[type="8"] .optionsButton,
richlistitem[type="16"] .optionsButton,
richlistitem[type="4"] .disableShow,
richlistitem[type="4"] .disableHide {
display: none;

5
toolkit/themes/winstripe/mozapps/extensions/extensions.css
Просмотреть файл

@ -254,12 +254,13 @@ richlistitem[opType="needs-disable"] .disableHide {
display: none;
}
richlistitem[plugin] .themeButton,
richlistitem[plugin] .optionsButton,
richlistitem[plugin] .uninstallButton,
richlistitem[type="2"] .themeButton,
richlistitem[type="8"] .themeButton,
richlistitem[type="16"] .themeButton,
richlistitem[type="4"] .optionsButton,
richlistitem[type="8"] .optionsButton,
richlistitem[type="16"] .optionsButton,
richlistitem[type="4"] .disableShow,
richlistitem[type="4"] .disableHide {
display: none;