[Pkg-mozext-commits] [refcontrol] 02/11: Imported Upstream version 0.8.17
David Prévot
taffit at moszumanska.debian.org
Sun Mar 22 16:38:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository refcontrol.
commit 15abe93e7776680386e0573aefe1952a3d418ca2
Author: David Prévot <david at tilapin.org>
Date: Sun Mar 22 12:00:51 2015 -0400
Imported Upstream version 0.8.17
---
chrome/content/refcontrolOptions.js | 11 +-
chrome/content/refcontrolOverlay.js | 6 +-
chrome/content/refcontrolOverlay.js.svnpatch.rej | 245 -----------------------
chrome/locale/ca-AD/refcontrol.dtd.bak | 67 -------
chrome/locale/el/refcontrol.dtd.bak | 67 -------
chrome/locale/fr/refcontrol.dtd.bak | 67 -------
chrome/locale/fr/refcontrol.properties.bak | 15 --
chrome/locale/it/refcontrol.properties.bak | 15 --
chrome/locale/ja-JP/refcontrol.properties.bak | 15 --
chrome/locale/pl/refcontrol.dtd.bak | 67 -------
chrome/locale/tr/refcontrol.dtd.bak | 67 -------
chrome/locale/uk-UA/refcontrol.dtd.bak | 67 -------
components/refcontrolComp.js | 14 +-
install.rdf | 6 +-
14 files changed, 26 insertions(+), 703 deletions(-)
diff --git a/chrome/content/refcontrolOptions.js b/chrome/content/refcontrolOptions.js
index f3b83b4..2b279e6 100644
--- a/chrome/content/refcontrolOptions.js
+++ b/chrome/content/refcontrolOptions.js
@@ -105,9 +105,9 @@ var refcontrolOptions = {
getProgressMode: function(aRow, aColumn) {},
getCellValue: function(aRow, aColumn) {},
cycleHeader: function(aColId, aElt) {},
- getRowProperties: function(aRow, aProperty) {},
- getColumnProperties: function(aColumn, aColumnElement, aProperty) {},
- getCellProperties: function getCellProperties(aRow, aColumn, aProperty)
+ getRowProperties: function(aRow) { return ""; },
+ getColumnProperties: function(aColumn, aColumnElement) { return ""; },
+ getCellProperties: function getCellProperties(aRow, aColumn)
{
try {
var bBold = false;
@@ -123,10 +123,13 @@ var refcontrolOptions = {
sValue = this.mgr.aRefActions[this.mgr.aSortKeys[aRow]].str;
bBold = (sValue.charAt(0) == '@' || sValue == '');
}
- if (bBold)
+ var aProperty = arguments[2];
+ if (aProperty !== undefined && bBold)
aProperty.AppendElement(this.atomBold);
+ return bBold ? "bold" : "";
} catch (ex) {
this.mgr.dumpEx(ex);
+ return "";
}
},
diff --git a/chrome/content/refcontrolOverlay.js b/chrome/content/refcontrolOverlay.js
index 624bbd2..3cd6e29 100644
--- a/chrome/content/refcontrolOverlay.js
+++ b/chrome/content/refcontrolOverlay.js
@@ -73,8 +73,12 @@ var refcontrolOverlay = {
{
var sSite;
try {
- sSite = window._content.document.location.hostname;
+ sSite = window.getBrowser().currentURI.host;
} catch (ex) {
+ try {
+ sSite = window._content.document.location.hostname;
+ } catch (ex) {
+ }
}
this.openOptions(sSite);
},
diff --git a/chrome/content/refcontrolOverlay.js.svnpatch.rej b/chrome/content/refcontrolOverlay.js.svnpatch.rej
deleted file mode 100644
index 64e87b1..0000000
--- a/chrome/content/refcontrolOverlay.js.svnpatch.rej
+++ /dev/null
@@ -1,245 +0,0 @@
---- chrome/content/refcontrolOverlay.js
-+++ chrome/content/refcontrolOverlay.js
-@@ -1,18 +1,26 @@
-
- var refcontrolOverlay = {
-
-- dump: function(aMessage)
-+ dump: function dump(aMessage)
- {
- var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
- consoleService.logStringMessage("RefControl: " + aMessage);
- },
-
-- getString: function(sStringName)
-+ dumpEx: function dumpEx(aException)
- {
-+ var msg = new String(aException);
-+ if ('stack' in aException)
-+ msg += "\n" + aException.stack;
-+ this.dump(msg);
-+ },
-+
-+ getString: function getString(sStringName)
-+ {
- return document.getElementById('refcontrol-strings').getString(sStringName);
- },
-
-- isOurURL: function(sURL)
-+ isOurURL: function isOurURL(sURL)
- {
- var svcIO = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
- try {
-@@ -23,12 +31,12 @@
- return (uri.schemeIs('http') || uri.schemeIs('https'));
- },
-
-- getLinkURL: function(contextMenu)
-+ getLinkURL: function getLinkURL(contextMenu)
- {
- return typeof(contextMenu.linkURL) == 'function' ? contextMenu.linkURL() : contextMenu.linkURL;
- },
-
-- openOptions: function(sSite)
-+ openOptions: function openOptions(sSite)
- {
- var winOptions = openDialog('chrome://refcontrol/content/refcontrolOptions.xul',
- 'RefControlOptions',
-@@ -40,18 +48,18 @@
- }
- },
-
-- openOptionsURL: function(sURL)
-+ openOptionsURL: function openOptionsURL(sURL)
- {
- var svcIO = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
- this.openOptions(svcIO.newURI(sURL, null, null).host);
- },
-
-- toolsOptions: function()
-+ toolsOptions: function toolsOptions()
- {
- this.openOptions();
- },
-
-- contextOptions: function()
-+ contextOptions: function contextOptions()
- {
- var sSite;
- try {
-@@ -61,17 +69,17 @@
- this.openOptions(sSite);
- },
-
-- contextOptionsLink: function()
-+ contextOptionsLink: function contextOptionsLink()
- {
- this.openOptionsURL(this.getLinkURL(gContextMenu));
- },
-
-- contextOptionsImage: function()
-+ contextOptionsImage: function contextOptionsImage()
- {
- this.openOptionsURL(gContextMenu.imageURL);
- },
-
-- onLoad: function()
-+ onLoad: function onLoad()
- {
- window.getBrowser().addProgressListener(this);
- document.getElementById("contentAreaContextMenu").addEventListener("popupshowing", this, false);
-@@ -92,7 +100,7 @@
- }
- },
-
-- onPopupShowing: function(e)
-+ onPopupShowing: function onPopupShowing(e)
- {
- var bShow = this.bShowContextMenu &&
- !gContextMenu.isTextSelected && !gContextMenu.onLink && !gContextMenu.onImage && !gContextMenu.onTextInput &&
-@@ -110,7 +118,7 @@
- },
-
- // Implement nsIEventListener
-- handleEvent: function(evt)
-+ handleEvent: function handleEvent(evt)
- {
- try {
- switch (evt.type)
-@@ -125,42 +133,30 @@
- this.dump("handleEvent: unknown event: " + evt.type);
- }
- } catch (ex) {
-- this.dump("handleEvent: " + ex);
-+ this.dumpEx(ex);
- }
- return undefined;
- },
-
-- onChangeEnabled: function(oPrefBranch)
-+ onChangeEnabled: function onChangeEnabled(oPrefBranch)
- {
-- try {
-- this.bEnabled = oPrefBranch.getBoolPref('enabled');
-- this.updateStatusbar();
-- } catch (ex) {
-- this.dump("onChangeEnabled: " + ex);
-- }
-+ this.bEnabled = oPrefBranch.getBoolPref('enabled');
-+ this.updateStatusbar();
- },
-
-- onChangeStatusbar: function(oPrefBranch)
-+ onChangeStatusbar: function onChangeStatusbar(oPrefBranch)
- {
-- try {
-- this.showStatusbar = oPrefBranch.getIntPref("statusbar");
-- this.updateStatusbar();
-- } catch (ex) {
-- this.dump("onChangeStatusbar: " + ex);
-- }
-+ this.showStatusbar = oPrefBranch.getIntPref("statusbar");
-+ this.updateStatusbar();
- },
-
-- onChangeContextMenu: function(oPrefBranch)
-+ onChangeContextMenu: function onChangeContextMenu(oPrefBranch)
- {
-- try {
-- this.bShowContextMenu = oPrefBranch.getBoolPref('contextMenu');
-- } catch (ex) {
-- this.dump("onChangeContextMenu: " + ex);
-- }
-+ this.bShowContextMenu = oPrefBranch.getBoolPref('contextMenu');
- },
-
- // Implement nsIObserver
-- observe: function(aSubject, aTopic, aData)
-+ observe: function observe(aSubject, aTopic, aData)
- {
- try {
- switch (aTopic)
-@@ -189,45 +185,45 @@
- break;
- }
- } catch (ex) {
-- this.dump("observe: " + ex);
-+ this.dumpEx(ex);
- }
- },
-
-- updateStatusbar: function()
-+ updateStatusbar: function updateStatusbar()
- {
-- try {
-- var sb = document.getElementById("refcontrol-status");
-- if (this.showStatusbar == 0)
-- {
-- sb.setAttribute("collapsed", true);
-- return;
-- }
-+ var sb = document.getElementById("refcontrol-status");
-+ if (this.showStatusbar == 0)
-+ {
-+ sb.setAttribute("collapsed", true);
-+ return;
-+ }
-
-- var theWindow = ("gBrowser" in window) ? window.gBrowser.contentWindow : window.frames[0];
-- var sRef = theWindow.document.referrer;
-- var sRefDisp = (sRef ? sRef : this.getString("StatusbarNoReferer"));
-- var sbIcon = document.getElementById("refcontrol-status-icon");
-- var sbText = document.getElementById("refcontrol-status-text");
-+ var theWindow = ("gBrowser" in window) ? window.gBrowser.contentWindow : window.frames[0];
-+ var sRef = theWindow.document.referrer;
-+ var sRefDisp = (sRef ? sRef : this.getString("StatusbarNoReferer"));
-+ var sbIcon = document.getElementById("refcontrol-status-icon");
-+ var sbText = document.getElementById("refcontrol-status-text");
-
-- sbText.value = sRefDisp;
-- sbText.hidden = (this.showStatusbar < 2);
-- sbText.setAttribute("tooltiptext", sRefDisp);
-- sbIcon.src = this.bEnabled ?
-- sRef ?
-- "chrome://refcontrol/skin/icon_enabled_ref.png" :
-- "chrome://refcontrol/skin/icon_enabled.png" :
-- "chrome://refcontrol/skin/icon_disabled.png";
-- sbIcon.setAttribute("tooltiptext", sRefDisp);
-- sb.removeAttribute("collapsed");
-- } catch (ex) {
-- this.dump("updateStatusbar: " + ex);
-- }
-+ sbText.value = sRefDisp;
-+ sbText.hidden = (this.showStatusbar < 2);
-+ sbText.setAttribute("tooltiptext", sRefDisp);
-+ sbIcon.src = this.bEnabled ?
-+ sRef ?
-+ "chrome://refcontrol/skin/icon_enabled_ref.png" :
-+ "chrome://refcontrol/skin/icon_enabled.png" :
-+ "chrome://refcontrol/skin/icon_disabled.png";
-+ sbIcon.setAttribute("tooltiptext", sRefDisp);
-+ sb.removeAttribute("collapsed");
- },
-
- // Implement nsIWebProgressListener
-- onLocationChange: function(aWebProgress, aRequest, aLocation)
-+ onLocationChange: function onLocationChange(aWebProgress, aRequest, aLocation)
- {
-- this.updateStatusbar();
-+ try {
-+ this.updateStatusbar();
-+ } catch (ex) {
-+ this.dumpEx(ex);
-+ }
- },
- onProgressChange: function(webProgress, request, curSelfProgress, maxSelfProgress, curTotalProgress, maxTotalProgress) {},
- onSecurityChange: function(webProgress, request, state) {},
-@@ -239,7 +235,7 @@
- onLinkIconAvailable: function(a) {},
-
- // Implement nsISupports
-- QueryInterface: function(aIID)
-+ QueryInterface: function QueryInterface(aIID)
- {
- if (aIID.equals(Components.interfaces.nsIObserver) ||
- aIID.equals(Components.interfaces.nsIWebProgressListener) ||
diff --git a/chrome/locale/ca-AD/refcontrol.dtd.bak b/chrome/locale/ca-AD/refcontrol.dtd.bak
deleted file mode 100644
index 389906f..0000000
--- a/chrome/locale/ca-AD/refcontrol.dtd.bak
+++ /dev/null
@@ -1,67 +0,0 @@
-<!ENTITY toolsmenu.options.label "Opcions de RefControl">
-<!ENTITY toolsmenu.options.accesskey "R">
-<!ENTITY contextmenu.options.label "Opcions RefControl per a aquesta web...">
-<!ENTITY contextmenu.options.accesskey "C">
-<!ENTITY contextmenu.optionslink.label "Opcions de RefControl per als enllaços de la web...">
-<!ENTITY contextmenu.optionslink.accesskey "f">
-<!ENTITY contextmenu.optionsimage.label "Opcions RefControl per a les imatges de la web...">
-<!ENTITY contextmenu.optionsimage.accesskey "R">
-<!ENTITY toolbarbutton.label "RefControl">
-<!ENTITY toolbarbutton.tooltip "RefControl">
-<!ENTITY options.title "Opcions de RefControl">
-<!ENTITY options.file.label "Arxiu">
-<!ENTITY options.file.accesskey "F">
-<!ENTITY options.import.label "Importa...">
-<!ENTITY options.import.accesskey "I">
-<!ENTITY options.export.label "Exporta...">
-<!ENTITY options.export.accesskey "E">
-<!ENTITY options.close.label "Tanca">
-<!ENTITY options.close.accesskey "C">
-<!ENTITY options.options.label "Opcions">
-<!ENTITY options.options.accesskey "O">
-<!ENTITY options.enable.label "Habilita RefControl">
-<!ENTITY options.enable.accesskey "E">
-<!ENTITY options.statusbar.label "Mostra a la barra d\'estat">
-<!ENTITY options.statusbar.accesskey "S">
-<!ENTITY options.contextmenu.label "Mostra en el menú de Context">
-<!ENTITY options.contextmenu.accesskey "C">
-<!ENTITY options.statusbar.none.label "Cap">
-<!ENTITY options.statusbar.none.accesskey "N">
-<!ENTITY options.statusbar.icon.label "Icona">
-<!ENTITY options.statusbar.icon.accesskey "I">
-<!ENTITY options.statusbar.referer.label "Referent">
-<!ENTITY options.statusbar.referer.accesskey "R">
-<!ENTITY options.help.label "Ajuda">
-<!ENTITY options.help.accesskey "H">
-<!ENTITY options.refcontrolhelp.label "Ajuda de RefControl">
-<!ENTITY options.refcontrolhelp.accesskey "H">
-<!ENTITY options.about.label "Sobre">
-<!ENTITY options.about.accesskey "A">
-<!ENTITY options.instructions.label "Pots especificar el referent que serà utilitzat per a cada web.">
-<!ENTITY options.sitecolumn.label "Lloc Web">
-<!ENTITY options.actioncolumn.label "Acció">
-<!ENTITY options.add.label "Afegeix Web">
-<!ENTITY options.add.accesskey "A">
-<!ENTITY options.edit.label "Edita Web">
-<!ENTITY options.edit.accesskey "E">
-<!ENTITY options.remove.label "Esborra web">
-<!ENTITY options.remove.accesskey "R">
-<!ENTITY options.removeall.label "Esborra totes les webs">
-<!ENTITY options.removeall.accesskey "I">
-<!ENTITY options.default.label "Per defecte a les webs que no són llistades:">
-<!ENTITY options.editdefault.label "Edita">
-<!ENTITY options.editdefault.accesskey "d">
-<!ENTITY edit.title "Propietats de la web per a RefControl">
-<!ENTITY edit.site.label "Lloc Web:">
-<!ENTITY edit.site.accesskey "S">
-<!ENTITY edit.action.label "Acció:">
-<!ENTITY edit.action.normal.label "Normal - envia l\'actual referent">
-<!ENTITY edit.action.normal.accesskey "N">
-<!ENTITY edit.action.block.label "Bloca - no enviïs cap referent">
-<!ENTITY edit.action.block.accesskey "B">
-<!ENTITY edit.action.forge.label "Farga - envia l\'atrel d\'aquesta web (http://Web/)">
-<!ENTITY edit.action.forge.accesskey "F">
-<!ENTITY edit.action.custom.label "Personalitzat:">
-<!ENTITY edit.action.custom.accesskey "C">
-<!ENTITY edit.3rdparty.label "Peticions de tercers només">
-<!ENTITY edit.3rdparty.accesskey "3">
diff --git a/chrome/locale/el/refcontrol.dtd.bak b/chrome/locale/el/refcontrol.dtd.bak
deleted file mode 100644
index 998bd02..0000000
--- a/chrome/locale/el/refcontrol.dtd.bak
+++ /dev/null
@@ -1,67 +0,0 @@
-<!ENTITY toolsmenu.options.label "Επιλογές RefControl">
-<!ENTITY toolsmenu.options.accesskey "Ε">
-<!ENTITY contextmenu.options.label "Επιλογές RefControl γι\' αυτό τον ιστότοπο">
-<!ENTITY contextmenu.options.accesskey "τ">
-<!ENTITY contextmenu.optionslink.label "Επιλογές RefControl για τον ιστότοπο του δεσμού...">
-<!ENTITY contextmenu.optionslink.accesskey "δ">
-<!ENTITY contextmenu.optionsimage.label "Επιλογές RefControl για τον ιστότοπο της εικόνας">
-<!ENTITY contextmenu.optionsimage.accesskey "κ">
-<!ENTITY toolbarbutton.label "RefControl">
-<!ENTITY toolbarbutton.tooltip "RefControl">
-<!ENTITY options.title "Επιλογές RefControl">
-<!ENTITY options.file.label "Αρχείο">
-<!ENTITY options.file.accesskey "Α">
-<!ENTITY options.import.label "Εισαγωγή">
-<!ENTITY options.import.accesskey "ι">
-<!ENTITY options.export.label "Εξαγωγή">
-<!ENTITY options.export.accesskey "ω">
-<!ENTITY options.close.label "Έξοδος">
-<!ENTITY options.close.accesskey "ξ">
-<!ENTITY options.options.label "Επιλογές">
-<!ENTITY options.options.accesskey "Ε">
-<!ENTITY options.enable.label "Ενεργοποίηση του RefControl">
-<!ENTITY options.enable.accesskey "Ε">
-<!ENTITY options.statusbar.label "Προβολή στη γραμμή κατάστασης">
-<!ENTITY options.statusbar.accesskey "γ">
-<!ENTITY options.contextmenu.label "Προβολή στο μενού περιεχομένου">
-<!ENTITY options.contextmenu.accesskey "π">
-<!ENTITY options.statusbar.none.label "Απόκρυψη">
-<!ENTITY options.statusbar.none.accesskey "Α">
-<!ENTITY options.statusbar.icon.label "Εικονίδιο">
-<!ENTITY options.statusbar.icon.accesskey "ν">
-<!ENTITY options.statusbar.referer.label "Referer">
-<!ENTITY options.statusbar.referer.accesskey "R">
-<!ENTITY options.help.label "Βοήθεια">
-<!ENTITY options.help.accesskey "Β">
-<!ENTITY options.refcontrolhelp.label "Βοήθεια RefControl">
-<!ENTITY options.refcontrolhelp.accesskey "Β">
-<!ENTITY options.about.label "Περί">
-<!ENTITY options.about.accesskey "Π">
-<!ENTITY options.instructions.label "Μπορείτε να ορίσετε το Referer που θα αποστέλλετε για κάθε ιστότοπο.">
-<!ENTITY options.sitecolumn.label "Ιστότοπος">
-<!ENTITY options.actioncolumn.label "Ενέργεια">
-<!ENTITY options.add.label "Προσθήκη ιστότοπου">
-<!ENTITY options.add.accesskey "Π">
-<!ENTITY options.edit.label "Επεξεργασία ιστότοπου">
-<!ENTITY options.edit.accesskey "Ε">
-<!ENTITY options.remove.label "Αφαίρεση ιστότοπου">
-<!ENTITY options.remove.accesskey "Α">
-<!ENTITY options.removeall.label "Αφαίρεση όλων των ιστότοπων">
-<!ENTITY options.removeall.accesskey "φ">
-<!ENTITY options.default.label "Αρχική ρύθμιση για ιστότοπους που δεν είναι στη λίστα">
-<!ENTITY options.editdefault.label "Επεξεργασία">
-<!ENTITY options.editdefault.accesskey "ρ">
-<!ENTITY edit.title "Ρυθμίσεις ιστότοπων του RefControl">
-<!ENTITY edit.site.label "Ιστότοπος :">
-<!ENTITY edit.site.accesskey "Ι">
-<!ENTITY edit.action.label "Ενέργεια :">
-<!ENTITY edit.action.normal.label "Κανονική - αποστολή του γνήσιου referer">
-<!ENTITY edit.action.normal.accesskey "Κ">
-<!ENTITY edit.action.block.label "Μπλοκάρισμα - μη αποστολή referer">
-<!ENTITY edit.action.block.accesskey "Μ">
-<!ENTITY edit.action.forge.label "Πλαστογράφηση - αποστολή βασικού καταλόγου ιστότοπου (http://SITE/)">
-<!ENTITY edit.action.forge.accesskey "Π">
-<!ENTITY edit.action.custom.label "Προσαρμοσμένη">
-<!ENTITY edit.action.custom.accesskey "ρ">
-<!ENTITY edit.3rdparty.label "Αιτήματα μόνο από τρίτους">
-<!ENTITY edit.3rdparty.accesskey "Α">
diff --git a/chrome/locale/fr/refcontrol.dtd.bak b/chrome/locale/fr/refcontrol.dtd.bak
deleted file mode 100644
index 5110739..0000000
--- a/chrome/locale/fr/refcontrol.dtd.bak
+++ /dev/null
@@ -1,67 +0,0 @@
-<!ENTITY toolsmenu.options.label "Options de RefControl...">
-<!ENTITY toolsmenu.options.accesskey "R">
-<!ENTITY contextmenu.options.label "Options de RefControl pour ce site...">
-<!ENTITY contextmenu.options.accesskey "C">
-<!ENTITY contextmenu.optionslink.label "Options de RefControl pour le site du lien...">
-<!ENTITY contextmenu.optionslink.accesskey "f">
-<!ENTITY contextmenu.optionsimage.label "Options de RefControl pour le site de l\'image...">
-<!ENTITY contextmenu.optionsimage.accesskey "R">
-<!ENTITY toolbarbutton.label "RefControl">
-<!ENTITY toolbarbutton.tooltip "RefControl">
-<!ENTITY options.title "Options de RefControl">
-<!ENTITY options.file.label "Fichier">
-<!ENTITY options.file.accesskey "F">
-<!ENTITY options.import.label "Importer">
-<!ENTITY options.import.accesskey "I">
-<!ENTITY options.export.label "Exporter">
-<!ENTITY options.export.accesskey "E">
-<!ENTITY options.close.label "Fermer">
-<!ENTITY options.close.accesskey "C">
-<!ENTITY options.options.label "Options">
-<!ENTITY options.options.accesskey "O">
-<!ENTITY options.enable.label "Activer RefControl">
-<!ENTITY options.enable.accesskey "A">
-<!ENTITY options.statusbar.label "Affichage dans la barre d\'état">
-<!ENTITY options.statusbar.accesskey "b">
-<!ENTITY options.contextmenu.label "Afficher dans le menu contextuel">
-<!ENTITY options.contextmenu.accesskey "C">
-<!ENTITY options.statusbar.none.label "Aucun">
-<!ENTITY options.statusbar.none.accesskey "n">
-<!ENTITY options.statusbar.icon.label "Icône">
-<!ENTITY options.statusbar.icon.accesskey "I">
-<!ENTITY options.statusbar.referer.label "Referer">
-<!ENTITY options.statusbar.referer.accesskey "R">
-<!ENTITY options.help.label "Aide">
-<!ENTITY options.help.accesskey "i">
-<!ENTITY options.refcontrolhelp.label "Aide de RefControl">
-<!ENTITY options.refcontrolhelp.accesskey "i">
-<!ENTITY options.about.label "À propos">
-<!ENTITY options.about.accesskey "p">
-<!ENTITY options.instructions.label "Vous pouvez préciser le referer qui sera utilisé pour chaque site">
-<!ENTITY options.sitecolumn.label "Site">
-<!ENTITY options.actioncolumn.label "Comportement">
-<!ENTITY options.add.label "Ajouter un site">
-<!ENTITY options.add.accesskey "A">
-<!ENTITY options.edit.label "Éditer un site">
-<!ENTITY options.edit.accesskey "s">
-<!ENTITY options.remove.label "Supprimer un site">
-<!ENTITY options.remove.accesskey "u">
-<!ENTITY options.removeall.label "Supprimer tous les sites">
-<!ENTITY options.removeall.accesskey "t">
-<!ENTITY options.default.label "Comportement par défaut pour les sites non répertoriés :">
-<!ENTITY options.editdefault.label "Éditer">
-<!ENTITY options.editdefault.accesskey "d">
-<!ENTITY edit.title "Paramètres de RefControl pour ce site">
-<!ENTITY edit.site.label "Site :">
-<!ENTITY edit.site.accesskey "S">
-<!ENTITY edit.action.label "Comportement :">
-<!ENTITY edit.action.normal.label "Normal - envoyer le véritable referrer (l\'adresse de provenance)">
-<!ENTITY edit.action.normal.accesskey "N">
-<!ENTITY edit.action.block.label "Blocage - ne pas envoyer de referer">
-<!ENTITY edit.action.block.accesskey "B">
-<!ENTITY edit.action.forge.label "Leurre - envoyer la racine de ce site (http://SITE/)">
-<!ENTITY edit.action.forge.accesskey "L">
-<!ENTITY edit.action.custom.label "Personnalisé :">
-<!ENTITY edit.action.custom.accesskey "P">
-<!ENTITY edit.3rdparty.label "Seulement pour les requêtes d\'applications tierces.">
-<!ENTITY edit.3rdparty.accesskey "t">
diff --git a/chrome/locale/fr/refcontrol.properties.bak b/chrome/locale/fr/refcontrol.properties.bak
deleted file mode 100644
index 035bd0b..0000000
--- a/chrome/locale/fr/refcontrol.properties.bak
+++ /dev/null
@@ -1,15 +0,0 @@
-extensions.{455D905A-D37C-4643-A9E2-F6FEFAA0424A}.description=Permet de contrôler pour chaque site ce qui est envoyé comme referer Http
-StatusbarNoReferer=AucunReferer
-ImportTitle=Importer
-ImportInvalidFileAlert=Ce n\'est pas un fichier RefControl valide
-ImportErrorAlert=Erreur lors de l\'importation
-ExportTitle=Exporter
-ExportErrorAlert=Erreur lors de l\'exportation
-ConfirmRemoveAll=Voulez-vous vraiment supprimer tous les sites ?
-SiteDefault=Par défaut
-ActionNormal=Normal
-ActionForge=Leurre
-ActionBlock=Blocage
-Action3rdParty=(appli. tierce)
-SiteNotFilledInAlert=La zone de saisie de site doit être remplie
-SiteInvalidCharactersAlert=Caractères invalides dans le nom du site
diff --git a/chrome/locale/it/refcontrol.properties.bak b/chrome/locale/it/refcontrol.properties.bak
deleted file mode 100644
index c0eee11..0000000
--- a/chrome/locale/it/refcontrol.properties.bak
+++ /dev/null
@@ -1,15 +0,0 @@
-extensions.{455D905A-D37C-4643-A9E2-F6FEFAA0424A}.description=Permette di controllare cosa viene trasmesso come referer HTTP per ogni sito
-StatusbarNoReferer=<Nessun referer>
-ImportTitle=Importa
-ImportInvalidFileAlert=Questo non è un file di RefControl valido
-ImportErrorAlert=Errore durante l\'importazione dal file
-ExportTitle=Esporta
-ExportErrorAlert=Errore durante l\'esportazione nel file
-ConfirmRemoveAll=Eliminare tutti i siti?
-SiteDefault=<Predefinito>
-ActionNormal=<Normale>
-ActionForge=<Contraffai>
-ActionBlock=<Blocca>
-Action3rdParty=(3° parti)
-SiteNotFilledInAlert=Il nome del sito deve essere presente!
-SiteInvalidCharactersAlert=Sono presenti caratteri non validi nel sito
diff --git a/chrome/locale/ja-JP/refcontrol.properties.bak b/chrome/locale/ja-JP/refcontrol.properties.bak
deleted file mode 100644
index 6af6a4a..0000000
--- a/chrome/locale/ja-JP/refcontrol.properties.bak
+++ /dev/null
@@ -1,15 +0,0 @@
-extensions.{455D905A-D37C-4643-A9E2-F6FEFAA0424A}.description=\\u30B5\\u30A4\\u30C8\\u3054\\u3068\\u306B\\u9001\\u4FE1\\u3055\\u308C\\u308B HTTP \\u30EA\\u30D5\\u30A1\\u30E9\\u3092\\u5236\\u5FA1\\u3057\\u307E\\u3059\\u3002
-StatusbarNoReferer=<\\u30EA\\u30D5\\u30A1\\u30E9\\u306A\\u3057>
-ImportTitle=\\u53D6\\u308A\\u8FBC\\u307F
-ImportInvalidFileAlert=\\u3053\\u308C\\u306F\\u6709\\u52B9\\u306A RefControl \\u30D5\\u30A1\\u30A4\\u30EB\\u3067\\u306F\\u3042\\u308A\\u307E\\u305B\\u3093\\u3002
-ImportErrorAlert=\\u30D5\\u30A1\\u30A4\\u30EB\\u304B\\u3089\\u306E\\u53D6\\u308A\\u8FBC\\u307F\\u30A8\\u30E9\\u30FC
-ExportTitle=\\u66F8\\u304D\\u51FA\\u3057
-ExportErrorAlert=\\u30D5\\u30A1\\u30A4\\u30EB\\u3078\\u306E\\u66F8\\u304D\\u51FA\\u3057\\u30A8\\u30E9\\u30FC
-ConfirmRemoveAll=\\u672C\\u5F53\\u306B\\u3059\\u3079\\u3066\\u306E\\u30B5\\u30A4\\u30C8\\u3092\\u9664\\u53BB\\u3057\\u307E\\u3059\\u304B\\uFF1F
-SiteDefault=<\\u65E2\\u5B9A>
-ActionNormal=<\\u901A\\u5E38>
-ActionForge=<\\u507D\\u88C5>
-ActionBlock=<\\u963B\\u6B62>
-Action3rdParty=(\\u7B2C\\u4E09\\u8005)
-SiteNotFilledInAlert=\\u30B5\\u30A4\\u30C8\\u304C\\u8A18\\u5165\\u3055\\u308C\\u3066\\u306A\\u3051\\u308C\\u3070\\u306A\\u308A\\u307E\\u305B\\u3093\\u3002
-SiteInvalidCharactersAlert=\\u30B5\\u30A4\\u30C8\\u306B\\u7121\\u52B9\\u306A\\u6587\\u5B57\\u304C\\u3042\\u308A\\u307E\\u3059\\u3002
diff --git a/chrome/locale/pl/refcontrol.dtd.bak b/chrome/locale/pl/refcontrol.dtd.bak
deleted file mode 100644
index 46c3603..0000000
--- a/chrome/locale/pl/refcontrol.dtd.bak
+++ /dev/null
@@ -1,67 +0,0 @@
-<!ENTITY toolsmenu.options.label "Opcje RefControl">
-<!ENTITY toolsmenu.options.accesskey "R">
-<!ENTITY contextmenu.options.label "Opcje RefControl dla tej strony...">
-<!ENTITY contextmenu.options.accesskey "O">
-<!ENTITY contextmenu.optionslink.label "Opcje RefControl dla odnośnika...">
-<!ENTITY contextmenu.optionslink.accesskey "L">
-<!ENTITY contextmenu.optionsimage.label "Opcje RefControl dla stron z obrazami">
-<!ENTITY contextmenu.optionsimage.accesskey "G">
-<!ENTITY toolbarbutton.label "RefControl">
-<!ENTITY toolbarbutton.tooltip "RefControl">
-<!ENTITY options.title "Opcje RefControl">
-<!ENTITY options.file.label "Plik">
-<!ENTITY options.file.accesskey "P">
-<!ENTITY options.import.label "Importuj...">
-<!ENTITY options.import.accesskey "I">
-<!ENTITY options.export.label "Eksportuj...">
-<!ENTITY options.export.accesskey "E">
-<!ENTITY options.close.label "Zamknij">
-<!ENTITY options.close.accesskey "Z">
-<!ENTITY options.options.label "Opcje">
-<!ENTITY options.options.accesskey "O">
-<!ENTITY options.enable.label "Włącz RefControl">
-<!ENTITY options.enable.accesskey "W">
-<!ENTITY options.statusbar.label "Wyświetlaj pasek Stanu">
-<!ENTITY options.statusbar.accesskey "S">
-<!ENTITY options.contextmenu.label "Pokazuj w menu Kontekstowym">
-<!ENTITY options.contextmenu.accesskey "K">
-<!ENTITY options.statusbar.none.label "Brak">
-<!ENTITY options.statusbar.none.accesskey "B">
-<!ENTITY options.statusbar.icon.label "Ikona">
-<!ENTITY options.statusbar.icon.accesskey "I">
-<!ENTITY options.statusbar.referer.label "Odsyłacz">
-<!ENTITY options.statusbar.referer.accesskey "O">
-<!ENTITY options.help.label "Pomoc">
-<!ENTITY options.help.accesskey "m">
-<!ENTITY options.refcontrolhelp.label "Pomoc RefControl\'a">
-<!ENTITY options.refcontrolhelp.accesskey "P">
-<!ENTITY options.about.label "O programie">
-<!ENTITY options.about.accesskey "O">
-<!ENTITY options.instructions.label "Możesz określić odsyłacz który będzie użyty dla poszczególnych stron.">
-<!ENTITY options.sitecolumn.label "Strona">
-<!ENTITY options.actioncolumn.label "Akcja">
-<!ENTITY options.add.label "Dodaj strone">
-<!ENTITY options.add.accesskey "D">
-<!ENTITY options.edit.label "Edytuj strone">
-<!ENTITY options.edit.accesskey "E">
-<!ENTITY options.remove.label "Usuń strone">
-<!ENTITY options.remove.accesskey "U">
-<!ENTITY options.removeall.label "Usuń wszystkie strony">
-<!ENTITY options.removeall.accesskey "W">
-<!ENTITY options.default.label "Domyślny dla stron które nie są na liście">
-<!ENTITY options.editdefault.label "Edytuj">
-<!ENTITY options.editdefault.accesskey "d">
-<!ENTITY edit.title "Właściwości strony">
-<!ENTITY edit.site.label "Strona:">
-<!ENTITY edit.site.accesskey "S">
-<!ENTITY edit.action.label "Akcja:">
-<!ENTITY edit.action.normal.label "Normalny - wyślij prawdziwy odsyłacz">
-<!ENTITY edit.action.normal.accesskey "N">
-<!ENTITY edit.action.block.label "Blokuj - nie wysyłaj żadnego odsyłacza">
-<!ENTITY edit.action.block.accesskey "B">
-<!ENTITY edit.action.forge.label "Oszukany - wyślij stronę główną (http://strona/)">
-<!ENTITY edit.action.forge.accesskey "O">
-<!ENTITY edit.action.custom.label "Własne:">
-<!ENTITY edit.action.custom.accesskey "W">
-<!ENTITY edit.3rdparty.label "Tylko dla zapytań z innych stron">
-<!ENTITY edit.3rdparty.accesskey "Z">
diff --git a/chrome/locale/tr/refcontrol.dtd.bak b/chrome/locale/tr/refcontrol.dtd.bak
deleted file mode 100644
index 8925ce1..0000000
--- a/chrome/locale/tr/refcontrol.dtd.bak
+++ /dev/null
@@ -1,67 +0,0 @@
-<!ENTITY toolsmenu.options.label "RefControl Seçenekleri...">
-<!ENTITY toolsmenu.options.accesskey "R">
-<!ENTITY contextmenu.options.label "Bu Site için RefControl Seçenekleri">
-<!ENTITY contextmenu.options.accesskey "C">
-<!ENTITY contextmenu.optionslink.label "Bağlantının Sitesi için RefControl Seçenekleri...">
-<!ENTITY contextmenu.optionslink.accesskey "f">
-<!ENTITY contextmenu.optionsimage.label "Resmin Sitesi için RefControl Seçenekleri">
-<!ENTITY contextmenu.optionsimage.accesskey "R">
-<!ENTITY toolbarbutton.label "RefControl">
-<!ENTITY toolbarbutton.tooltip "RefControl">
-<!ENTITY options.title "RefControl Seçenekleri">
-<!ENTITY options.file.label "Dosya">
-<!ENTITY options.file.accesskey "F">
-<!ENTITY options.import.label "İndir...">
-<!ENTITY options.import.accesskey "I">
-<!ENTITY options.export.label "Aktar...">
-<!ENTITY options.export.accesskey "E">
-<!ENTITY options.close.label "Kapa">
-<!ENTITY options.close.accesskey "C">
-<!ENTITY options.options.label "Seçenekler">
-<!ENTITY options.options.accesskey "O">
-<!ENTITY options.enable.label "RefControl Seçilir kıl">
-<!ENTITY options.enable.accesskey "E">
-<!ENTITY options.statusbar.label "Durum çubuğu Göstergesi">
-<!ENTITY options.statusbar.accesskey "S">
-<!ENTITY options.contextmenu.label "Kısayol menü öğesi olarak göster">
-<!ENTITY options.contextmenu.accesskey "C">
-<!ENTITY options.statusbar.none.label "Hiçbir">
-<!ENTITY options.statusbar.none.accesskey "N">
-<!ENTITY options.statusbar.icon.label "Simge">
-<!ENTITY options.statusbar.icon.accesskey "I">
-<!ENTITY options.statusbar.referer.label "Gönderen">
-<!ENTITY options.statusbar.referer.accesskey "R">
-<!ENTITY options.help.label "Yardım">
-<!ENTITY options.help.accesskey "H">
-<!ENTITY options.refcontrolhelp.label "RefControl Yardım">
-<!ENTITY options.refcontrolhelp.accesskey "H">
-<!ENTITY options.about.label "Hakkında">
-<!ENTITY options.about.accesskey "A">
-<!ENTITY options.instructions.label "Her site için kullanılacak Gönderen\'i belirleyebilirsiniz.">
-<!ENTITY options.sitecolumn.label "Site">
-<!ENTITY options.actioncolumn.label "Olay">
-<!ENTITY options.add.label "Site Ekle">
-<!ENTITY options.add.accesskey "A">
-<!ENTITY options.edit.label "Site Düzenle">
-<!ENTITY options.edit.accesskey "E">
-<!ENTITY options.remove.label "Site Kaldır">
-<!ENTITY options.remove.accesskey "R">
-<!ENTITY options.removeall.label "Tüm Siteleri Kaldır">
-<!ENTITY options.removeall.accesskey "I">
-<!ENTITY options.default.label "Listede olmayan siteler için varsayılan:">
-<!ENTITY options.editdefault.label "Düzenle">
-<!ENTITY options.editdefault.accesskey "d">
-<!ENTITY edit.title "RefControl Site Özellikleri">
-<!ENTITY edit.site.label "Site:">
-<!ENTITY edit.site.accesskey "S">
-<!ENTITY edit.action.label "Olay:">
-<!ENTITY edit.action.normal.label "Normal - gerçek göndereneni yolla">
-<!ENTITY edit.action.normal.accesskey "N">
-<!ENTITY edit.action.block.label "Blok - gönderen yollama">
-<!ENTITY edit.action.block.accesskey "B">
-<!ENTITY edit.action.forge.label "Uydurma - bu sitenin kökünü gönder (http://SITE/)">
-<!ENTITY edit.action.forge.accesskey "F">
-<!ENTITY edit.action.custom.label "Özel:">
-<!ENTITY edit.action.custom.accesskey "C">
-<!ENTITY edit.3rdparty.label "Yalnızcı 3. parti istekler">
-<!ENTITY edit.3rdparty.accesskey "3">
diff --git a/chrome/locale/uk-UA/refcontrol.dtd.bak b/chrome/locale/uk-UA/refcontrol.dtd.bak
deleted file mode 100644
index 51f6486..0000000
--- a/chrome/locale/uk-UA/refcontrol.dtd.bak
+++ /dev/null
@@ -1,67 +0,0 @@
-<!ENTITY toolsmenu.options.label "Налаштування RefControl...">
-<!ENTITY toolsmenu.options.accesskey "ш">
-<!ENTITY contextmenu.options.label "Налаштування RefControl для цього сайту...">
-<!ENTITY contextmenu.options.accesskey "ц">
-<!ENTITY contextmenu.optionslink.label "Налаштування RefControl для посилань сайту...">
-<!ENTITY contextmenu.optionslink.accesskey "п">
-<!ENTITY contextmenu.optionsimage.label "Налаштування RefControl для зображень сайту...">
-<!ENTITY contextmenu.optionsimage.accesskey "з">
-<!ENTITY toolbarbutton.label "RefControl">
-<!ENTITY toolbarbutton.tooltip "RefControl">
-<!ENTITY options.title "Налаштування RefControl">
-<!ENTITY options.file.label "Файл">
-<!ENTITY options.file.accesskey "й">
-<!ENTITY options.import.label "Імпорт...">
-<!ENTITY options.import.accesskey "м">
-<!ENTITY options.export.label "Експорт...">
-<!ENTITY options.export.accesskey "к">
-<!ENTITY options.close.label "Закрити">
-<!ENTITY options.close.accesskey "а">
-<!ENTITY options.options.label "Налаштування">
-<!ENTITY options.options.accesskey "ш">
-<!ENTITY options.enable.label "Включити RefControl">
-<!ENTITY options.enable.accesskey "л">
-<!ENTITY options.statusbar.label "Відображати в рядку стану">
-<!ENTITY options.statusbar.accesskey "б">
-<!ENTITY options.contextmenu.label "Показати у контекстному меню">
-<!ENTITY options.contextmenu.accesskey "з">
-<!ENTITY options.statusbar.none.label "Нічого">
-<!ENTITY options.statusbar.none.accesskey "ч">
-<!ENTITY options.statusbar.icon.label "Іконка">
-<!ENTITY options.statusbar.icon.accesskey "І">
-<!ENTITY options.statusbar.referer.label "Іконка і Referer">
-<!ENTITY options.statusbar.referer.accesskey "R">
-<!ENTITY options.help.label "Допомога">
-<!ENTITY options.help.accesskey "п">
-<!ENTITY options.refcontrolhelp.label "Допомога RefControl">
-<!ENTITY options.refcontrolhelp.accesskey "п">
-<!ENTITY options.about.label "Про">
-<!ENTITY options.about.accesskey "о">
-<!ENTITY options.instructions.label "Ви можете визначити \'Referer\' (відсилання посилання на сторінку з якої було здійснено перехід на дану сторінку) для кожного сайту.">
-<!ENTITY options.sitecolumn.label "Сайт">
-<!ENTITY options.actioncolumn.label "Дія">
-<!ENTITY options.add.label "Додати Сайт">
-<!ENTITY options.add.accesskey "о">
-<!ENTITY options.edit.label "Змінити Сайт">
-<!ENTITY options.edit.accesskey "м">
-<!ENTITY options.remove.label "Видалити Сайт">
-<!ENTITY options.remove.accesskey "и">
-<!ENTITY options.removeall.label "Видалити Всі Сайти">
-<!ENTITY options.removeall.accesskey "с">
-<!ENTITY options.default.label "За умовчанням для сайтів, що не внесені до списку :">
-<!ENTITY options.editdefault.label "Змінити">
-<!ENTITY options.editdefault.accesskey "н">
-<!ENTITY edit.title "RefControl - Властивості Сайтів">
-<!ENTITY edit.site.label "Сайт:">
-<!ENTITY edit.site.accesskey "С">
-<!ENTITY edit.action.label "Дія:">
-<!ENTITY edit.action.normal.label "Нормально - відіслати актуальне посилання \'referrer\'">
-<!ENTITY edit.action.normal.accesskey "р">
-<!ENTITY edit.action.block.label "Заблокувати - не відсилати \'referrer\'">
-<!ENTITY edit.action.block.accesskey "б">
-<!ENTITY edit.action.forge.label "Підмінити - відіслати корінь цього сайту (http://САЙТ/)">
-<!ENTITY edit.action.forge.accesskey "м">
-<!ENTITY edit.action.custom.label "Вказати інше:">
-<!ENTITY edit.action.custom.accesskey "з">
-<!ENTITY edit.3rdparty.label "Запити тільки 3-іх сторін">
-<!ENTITY edit.3rdparty.accesskey "3">
diff --git a/components/refcontrolComp.js b/components/refcontrolComp.js
index ac2a190..37c750e 100644
--- a/components/refcontrolComp.js
+++ b/components/refcontrolComp.js
@@ -3,6 +3,7 @@ refcontrolObserver.prototype = {
bEnabled: true,
aRefActions: {},
+ ioService: Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService),
dump: function dump(aMessage)
{
@@ -104,6 +105,15 @@ refcontrolObserver.prototype = {
);
},
+ makeURI: function(sRef)
+ {
+ try {
+ return this.ioService.newURI(sRef, null, null);
+ } catch (ex) {
+ return null;
+ }
+ },
+
adjustRef: function adjustRef(oChannel, sSite)
{
try {
@@ -135,10 +145,8 @@ refcontrolObserver.prototype = {
sRef = this.performVariableInterpolation(oChannel, refAction.str);
//this.dump("adjustRef: setting Referer for " + oChannel.URI.spec + " to " + sRef);
+ oChannel.referrer = this.makeURI(sRef);
oChannel.setRequestHeader("Referer", sRef, false);
- if (oChannel.referrer)
- oChannel.referrer.spec = sRef;
-
return true;
} catch (ex) {
this.dumpEx(ex);
diff --git a/install.rdf b/install.rdf
index a27c87f..94f145b 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
<em:id>{455D905A-D37C-4643-A9E2-F6FEFAA0424A}</em:id>
<em:name>RefControl</em:name>
- <em:version>0.8.16</em:version>
+ <em:version>0.8.17</em:version>
<em:type>2</em:type>
<em:description>Control what gets sent as the HTTP Referer on a per-site basis.</em:description>
<em:creator>James Abbatiello</em:creator>
@@ -43,7 +43,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.5</em:minVersion>
- <em:maxVersion>10.*</em:maxVersion>
+ <em:maxVersion>36.*</em:maxVersion>
</Description>
</em:targetApplication>
@@ -51,7 +51,7 @@
<Description>
<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
<em:minVersion>2.0</em:minVersion>
- <em:maxVersion>2.0.*</em:maxVersion>
+ <em:maxVersion>2.21.*</em:maxVersion>
</Description>
</em:targetApplication>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/refcontrol.git
More information about the Pkg-mozext-commits
mailing list