aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chrome/content/code/redirect.js3
-rw-r--r--components/interfaces/rdIMatchResult.idl12
-rw-r--r--components/interfaces/rdIRedirect.idl2
3 files changed, 7 insertions, 10 deletions
diff --git a/chrome/content/code/redirect.js b/chrome/content/code/redirect.js
index 2be8fc9..c4fddf8 100644
--- a/chrome/content/code/redirect.js
+++ b/chrome/content/code/redirect.js
@@ -2,6 +2,7 @@
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
function Redirect(exampleUrl, includePattern, redirectUrl, patternType, excludePattern, unescapeMatches, disabled) {
this._init(exampleUrl, includePattern, redirectUrl, patternType, excludePattern, unescapeMatches, disabled);
}
@@ -29,7 +30,7 @@ Redirect.prototype = {
this._rxExclude = this._compile(value);
},
- redirectTo : null,
+ redirectUrl : null,
get patternType() { return this._patternType; },
set patternType(value) {
diff --git a/components/interfaces/rdIMatchResult.idl b/components/interfaces/rdIMatchResult.idl
index 16de67c..371a7d7 100644
--- a/components/interfaces/rdIMatchResult.idl
+++ b/components/interfaces/rdIMatchResult.idl
@@ -4,14 +4,10 @@
[scriptable, uuid(cf89b480-bce3-11de-a0dd-028037ec0200)]
interface rdIMatchResult : nsISupports {
- /* Result constants */
- const short NO_MATCH = 0;
- const short MATCH = 1;
- const short DISABLED_MATCH = 2;
- const short EXCLUDED_MATCH = 3;
-
/* Attributes */
- attribute wstring redirectTo;
- attribute short result;
+ readonly attribute wstring redirectTo;
+ readonly attribute boolean isMatch;
+ readonly attribute boolean isExcludeMatch;
+ readonly attribute boolean isDisabledMatch;
};
diff --git a/components/interfaces/rdIRedirect.idl b/components/interfaces/rdIRedirect.idl
index cd67b30..0421d8e 100644
--- a/components/interfaces/rdIRedirect.idl
+++ b/components/interfaces/rdIRedirect.idl
@@ -9,7 +9,7 @@ interface rdIRedirect : nsISupports {
attribute wstring exampleUrl;
attribute wstring includePattern;
attribute wstring excludePattern;
- attribute wstring redirectTo;
+ attribute wstring redirectUrl;
attribute wchar patternType;
attribute boolean unescapeMatches;
attribute boolean disabled;