summaryrefslogtreecommitdiffabout
authorwilliamt <williamt>2007-01-05 10:10:55 (UTC)
committer williamt <williamt>2007-01-05 10:10:55 (UTC)
commitd85adfb349b3c7a988bec21fcbad86f5f98c70de (patch) (side-by-side diff)
treeb0bff7d20e03d2e4ba4bfb3309059930006ab927
parentc4b3096e166a0a9a60fd27c8f2dc06e688f13172 (diff)
downloadfoxri-d85adfb349b3c7a988bec21fcbad86f5f98c70de.zip
foxri-d85adfb349b3c7a988bec21fcbad86f5f98c70de.tar.gz
foxri-d85adfb349b3c7a988bec21fcbad86f5f98c70de.tar.bz2
* Updated for Firefox 2REL_1_1_2upstream/master
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xsrc/chrome/content/foxri.xul8
-rwxr-xr-xsrc/components/xriProtocolHandler.js10
-rwxr-xr-xsrc/install.rdf4
3 files changed, 8 insertions, 14 deletions
diff --git a/src/chrome/content/foxri.xul b/src/chrome/content/foxri.xul
index dc1cc37..785cc0c 100755
--- a/src/chrome/content/foxri.xul
+++ b/src/chrome/content/foxri.xul
@@ -20,13 +20,9 @@ function xriFix(event)
</script>
- <toolbaritem id="urlbar-container">
- <textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" />
- </toolbaritem>
+ <textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" />
- <toolbaritem id="go-container">
- <toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" />
- </toolbaritem>
+ <toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" />
</overlay>
diff --git a/src/components/xriProtocolHandler.js b/src/components/xriProtocolHandler.js
index 7046cde..1105874 100755
--- a/src/components/xriProtocolHandler.js
+++ b/src/components/xriProtocolHandler.js
@@ -315,7 +315,7 @@ function isKnownServiceType(type)
function getServiceClass(type)
{
- if (isKnownServiceType(type)) {
+ if (type && isKnownServiceType(type)) {
return SERVICE_CLASSES[type.toLowerCase()];
}
return type;
@@ -797,7 +797,7 @@ XRIChannel.prototype = {
},
-/* public fields (nsIChannel implmentation) */
+/* public fields (nsIChannel implementation) */
allowPipelining: false,
redirectionLimit: 5,
referrer: "",
@@ -815,6 +815,7 @@ XRIChannel.prototype = {
return val;
}
catch (e) {
+ dump("getRequestHeader - got exception: " + e + "\n");
throw e;
}
},
@@ -828,12 +829,9 @@ XRIChannel.prototype = {
return val;
}
catch (e) {
+ dump("getResponseHeader - got exception: " + e + "\n");
throw e;
}
-/* XXX
- if (header == "Content-Type")
- return "text/html";
-*/
return null;
},
isNoCacheResponse: function() {
diff --git a/src/install.rdf b/src/install.rdf
index a482755..507420c 100755
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>foxri@foxri.net</em:id>
- <em:version>1.1.1</em:version>
+ <em:version>1.1.2</em:version>
<em:type>2</em:type>
<!-- Target Application this extension can install into,
@@ -14,7 +14,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.0</em:minVersion>
- <em:maxVersion>1.5.0.*</em:maxVersion>
+ <em:maxVersion>2.0.*</em:maxVersion>
</Description>
</em:targetApplication>