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 880322 - Remove support for icons property; consumers should be using CSS for styling. rs=mconley

Browse Source
This commit is contained in:
Gijs Kruitbosch 2013-06-06 18:53:28 +02:00
parent eec0215ba5
commit e5a6330b85
2 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/components/customizableui/src/CustomizableUI.jsm
View File

@ -1330,7 +1330,6 @@ let CustomizableUIInternal = {
allowedAreas: [], allowedAreas: [],
shortcut: null, shortcut: null,
description: null, description: null,
icons: {}
}; };
if (typeof aData.id != "string" || !/^[a-z0-9-_]{1,}$/i.test(aData.id)) { if (typeof aData.id != "string" || !/^[a-z0-9-_]{1,}$/i.test(aData.id)) {
@ -1376,15 +1375,6 @@ let CustomizableUIInternal = {
widget.disabled = aData.disabled === true; widget.disabled = aData.disabled === true;
if (typeof aData.icons == "object") {
let sizes = Object.keys(aData.icons);
for (let size of sizes) {
if (size == parseInt(size, 10)) {
widget.icons[size] = aData.icons[size];
}
}
}
widget.onClick = typeof aData.onClick == "function" ? aData.onClick : null; widget.onClick = typeof aData.onClick == "function" ? aData.onClick : null;
widget.onCreated = typeof aData.onCreated == "function" ? aData.onCreated : null; widget.onCreated = typeof aData.onCreated == "function" ? aData.onCreated : null;

40
browser/components/customizableui/src/CustomizableWidgets.jsm
View File

@ -39,11 +39,6 @@ const CustomizableWidgets = [{
removable: true, removable: true,
defaultArea: CustomizableUI.AREA_PANEL, defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR], allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
icons: {
"16": "chrome://branding/content/icon16.png",
"32": "chrome://branding/content/icon48.png",
"48": "chrome://branding/content/icon48.png"
},
onViewShowing: function(aEvent) { onViewShowing: function(aEvent) {
// Populate our list of history // Populate our list of history
const kMaxResults = 15; const kMaxResults = 15;
@ -107,11 +102,6 @@ const CustomizableWidgets = [{
removable: true, removable: true,
defaultArea: CustomizableUI.AREA_PANEL, defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL], allowedAreas: [CustomizableUI.AREA_PANEL],
icons: {
"16": "chrome://branding/content/icon16.png",
"32": "chrome://branding/content/icon48.png",
"48": "chrome://branding/content/icon48.png"
},
onCommand: function(e) { onCommand: function(e) {
if (e.target && e.target.ownerDocument && e.target.ownerDocument.defaultView) { if (e.target && e.target.ownerDocument && e.target.ownerDocument.defaultView) {
let win = e.target.ownerDocument.defaultView; let win = e.target.ownerDocument.defaultView;
@ -125,11 +115,6 @@ const CustomizableWidgets = [{
removable: true, removable: true,
defaultArea: CustomizableUI.AREA_PANEL, defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL], allowedAreas: [CustomizableUI.AREA_PANEL],
icons: {
"16": "chrome://branding/content/icon16.png",
"32": "chrome://branding/content/icon48.png",
"48": "chrome://branding/content/icon48.png"
},
onCommand: function(aEvent) { onCommand: function(aEvent) {
let win = aEvent.target && let win = aEvent.target &&
aEvent.target.ownerDocument && aEvent.target.ownerDocument &&
@ -143,11 +128,6 @@ const CustomizableWidgets = [{
removable: true, removable: true,
defaultArea: CustomizableUI.AREA_PANEL, defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL], allowedAreas: [CustomizableUI.AREA_PANEL],
icons: {
"16": "chrome://branding/content/icon16.png",
"32": "chrome://branding/content/icon48.png",
"48": "chrome://branding/content/icon48.png"
},
onCommand: function(aEvent) { onCommand: function(aEvent) {
let win = aEvent.target && let win = aEvent.target &&
aEvent.target.ownerDocument && aEvent.target.ownerDocument &&
@ -161,11 +141,6 @@ const CustomizableWidgets = [{
removable: true, removable: true,
defaultArea: CustomizableUI.AREA_PANEL, defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL], allowedAreas: [CustomizableUI.AREA_PANEL],
icons: {
"16": "chrome://branding/content/icon16.png",
"32": "chrome://branding/content/icon48.png",
"48": "chrome://branding/content/icon48.png"
},
onCommand: function(aEvent) { onCommand: function(aEvent) {
let win = aEvent.target let win = aEvent.target
&& aEvent.target.ownerDocument && aEvent.target.ownerDocument
@ -179,11 +154,6 @@ const CustomizableWidgets = [{
removable: true, removable: true,
defaultArea: CustomizableUI.AREA_PANEL, defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL], allowedAreas: [CustomizableUI.AREA_PANEL],
icons: {
"16": "chrome://branding/content/icon16.png",
"32": "chrome://branding/content/icon48.png",
"48": "chrome://branding/content/icon48.png"
},
onCommand: function(aEvent) { onCommand: function(aEvent) {
let win = aEvent.target && let win = aEvent.target &&
aEvent.target.ownerDocument && aEvent.target.ownerDocument &&
@ -197,11 +167,6 @@ const CustomizableWidgets = [{
removable: true, removable: true,
defaultArea: CustomizableUI.AREA_PANEL, defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL], allowedAreas: [CustomizableUI.AREA_PANEL],
icons: {
"16": "chrome://branding/content/icon16.png",
"32": "chrome://branding/content/icon48.png",
"48": "chrome://branding/content/icon48.png"
},
onCommand: function(aEvent) { onCommand: function(aEvent) {
let win = aEvent.target && let win = aEvent.target &&
aEvent.target.ownerDocument && aEvent.target.ownerDocument &&
@ -215,11 +180,6 @@ const CustomizableWidgets = [{
removable: true, removable: true,
defaultArea: CustomizableUI.AREA_PANEL, defaultArea: CustomizableUI.AREA_PANEL,
allowedAreas: [CustomizableUI.AREA_PANEL], allowedAreas: [CustomizableUI.AREA_PANEL],
icons: {
"16": "chrome://branding/content/icon16.png",
"32": "chrome://branding/content/icon48.png",
"48": "chrome://branding/content/icon48.png"
},
onCommand: function(aEvent) { onCommand: function(aEvent) {
let win = aEvent.target && let win = aEvent.target &&
aEvent.target.ownerDocument && aEvent.target.ownerDocument &&