summaryrefslogtreecommitdiffabout
authorwilliamt <williamt>2007-01-05 10:10:55 (UTC)
committer williamt <williamt>2007-01-05 10:10:55 (UTC)
commitd85adfb349b3c7a988bec21fcbad86f5f98c70de (patch) (unidiff)
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) (show whitespace changes)
-rwxr-xr-xsrc/chrome/content/foxri.xul4
-rwxr-xr-xsrc/components/xriProtocolHandler.js10
-rwxr-xr-xsrc/install.rdf4
3 files changed, 6 insertions, 12 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)
20</script> 20</script>
21 21
22 22
23 <toolbaritem id="urlbar-container">
24 <textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" /> 23 <textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" />
25 </toolbaritem>
26 24
27 <toolbaritem id="go-container">
28 <toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" /> 25 <toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" />
29 </toolbaritem>
30 26
31</overlay> 27</overlay>
32 28
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)
315 315
316function getServiceClass(type) 316function getServiceClass(type)
317{ 317{
318 if (isKnownServiceType(type)) { 318 if (type && isKnownServiceType(type)) {
319 return SERVICE_CLASSES[type.toLowerCase()]; 319 return SERVICE_CLASSES[type.toLowerCase()];
320 } 320 }
321 return type; 321 return type;
@@ -797,7 +797,7 @@ XRIChannel.prototype = {
797 }, 797 },
798 798
799 799
800/* public fields (nsIChannel implmentation) */ 800/* public fields (nsIChannel implementation) */
801 allowPipelining: false, 801 allowPipelining: false,
802 redirectionLimit: 5, 802 redirectionLimit: 5,
803 referrer: "", 803 referrer: "",
@@ -815,6 +815,7 @@ XRIChannel.prototype = {
815 return val; 815 return val;
816 } 816 }
817 catch (e) { 817 catch (e) {
818 dump("getRequestHeader - got exception: " + e + "\n");
818 throw e; 819 throw e;
819 } 820 }
820 }, 821 },
@@ -828,12 +829,9 @@ XRIChannel.prototype = {
828 return val; 829 return val;
829 } 830 }
830 catch (e) { 831 catch (e) {
832 dump("getResponseHeader - got exception: " + e + "\n");
831 throw e; 833 throw e;
832 } 834 }
833/* XXX
834 if (header == "Content-Type")
835 return "text/html";
836*/
837 return null; 835 return null;
838 }, 836 },
839 isNoCacheResponse: function() { 837 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 @@
5 5
6 <Description about="urn:mozilla:install-manifest"> 6 <Description about="urn:mozilla:install-manifest">
7 <em:id>foxri@foxri.net</em:id> 7 <em:id>foxri@foxri.net</em:id>
8 <em:version>1.1.1</em:version> 8 <em:version>1.1.2</em:version>
9 <em:type>2</em:type> 9 <em:type>2</em:type>
10 10
11 <!-- Target Application this extension can install into, 11 <!-- Target Application this extension can install into,
@@ -14,7 +14,7 @@
14 <Description> 14 <Description>
15 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> 15 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
16 <em:minVersion>1.0</em:minVersion> 16 <em:minVersion>1.0</em:minVersion>
17 <em:maxVersion>1.5.0.*</em:maxVersion> 17 <em:maxVersion>2.0.*</em:maxVersion>
18 </Description> 18 </Description>
19 </em:targetApplication> 19 </em:targetApplication>
20 20