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) (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
@@ -11,22 +11,18 @@
11 11
12<script> 12<script>
13function xriFix(event) 13function xriFix(event)
14{ 14{
15 var txt = gURLBar.value; 15 var txt = gURLBar.value;
16 if (/^(=|@|!)\S+/.test(txt)) { 16 if (/^(=|@|!)\S+/.test(txt)) {
17 gURLBar.value = "xri://" + txt; 17 gURLBar.value = "xri://" + txt;
18 } 18 }
19} 19}
20</script> 20</script>
21 21
22 22
23 <toolbaritem id="urlbar-container"> 23 <textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" />
24 <textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" />
25 </toolbaritem>
26 24
27 <toolbaritem id="go-container"> 25 <toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" />
28 <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
@@ -306,25 +306,25 @@ function renderService(srv, doc, qxri)
306 306
307 307
308function isKnownServiceType(type) 308function isKnownServiceType(type)
309{ 309{
310 if (type.toLowerCase() in SERVICE_CLASSES) { 310 if (type.toLowerCase() in SERVICE_CLASSES) {
311 return true; 311 return true;
312 } 312 }
313 return false; 313 return false;
314} 314}
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;
322} 322}
323 323
324 324
325function guessServiceTypeByURI(uri) 325function guessServiceTypeByURI(uri)
326{ 326{
327 if (uri == null || uri == "") { 327 if (uri == null || uri == "") {
328 return "unknown"; 328 return "unknown";
329 } 329 }
330 if (uri.match(/^https?:/i)) { 330 if (uri.match(/^https?:/i)) {
@@ -788,61 +788,59 @@ XRIChannel.prototype = {
788 788
789 // these nsIRequest attributes must be copied to the stub 789 // these nsIRequest attributes must be copied to the stub
790 // channel that we created 790 // channel that we created
791 channel.notificationCallbacks = this.notificationCallbacks; 791 channel.notificationCallbacks = this.notificationCallbacks;
792 channel.loadGroup = this.loadGroup; 792 channel.loadGroup = this.loadGroup;
793 channel.loadFlags = this.loadFlags; 793 channel.loadFlags = this.loadFlags;
794 794
795 this.mChannel = channel; 795 this.mChannel = channel;
796 channel.asyncOpen(this, null); 796 channel.asyncOpen(this, null);
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: "",
804 requestMethod: "GET", 804 requestMethod: "GET",
805 requestSucceeded: true, 805 requestSucceeded: true,
806 responseStatus: 200, 806 responseStatus: 200,
807 responseStatusText: "OK", 807 responseStatusText: "OK",
808 getRequestHeader: function(header) { 808 getRequestHeader: function(header) {
809 dump("getRequestHeader(" + header + ")\n"); 809 dump("getRequestHeader(" + header + ")\n");
810 var httpChannel = this.mChannel.QueryInterface(nsIHttpChannel); 810 var httpChannel = this.mChannel.QueryInterface(nsIHttpChannel);
811 811
812 try { 812 try {
813 var val = httpChannel.getRequestHeader(header); 813 var val = httpChannel.getRequestHeader(header);
814 dump("getRequestHeader(" + header + ") = " + val + "\n"); 814 dump("getRequestHeader(" + header + ") = " + val + "\n");
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 },
821 getResponseHeader: function(header) { 822 getResponseHeader: function(header) {
822 dump("getResponseHeader(" + header + ")\n"); 823 dump("getResponseHeader(" + header + ")\n");
823 var httpChannel = this.mChannel.QueryInterface(nsIHttpChannel); 824 var httpChannel = this.mChannel.QueryInterface(nsIHttpChannel);
824 825
825 try { 826 try {
826 var val = httpChannel.getResponseHeader(header); 827 var val = httpChannel.getResponseHeader(header);
827 dump("getResponseHeader(" + header + ") = " + val + "\n"); 828 dump("getResponseHeader(" + header + ") = " + val + "\n");
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() {
840 dump("isNoCacheResponse()\n"); 838 dump("isNoCacheResponse()\n");
841 var httpChannel = this.mChannel.QueryInterface(nsIHttpChannel); 839 var httpChannel = this.mChannel.QueryInterface(nsIHttpChannel);
842 return httpChannel.isNoCacheResponse(); 840 return httpChannel.isNoCacheResponse();
843 }, 841 },
844 isNoStoreResponse: function() { 842 isNoStoreResponse: function() {
845 dump("isNoStoreResponse()\n"); 843 dump("isNoStoreResponse()\n");
846 var httpChannel = this.mChannel.QueryInterface(nsIHttpChannel); 844 var httpChannel = this.mChannel.QueryInterface(nsIHttpChannel);
847 return httpChannel.isNoStoreResponse(); 845 return httpChannel.isNoStoreResponse();
848 return true; 846 return true;
diff --git a/src/install.rdf b/src/install.rdf
index a482755..507420c 100755
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -1,29 +1,29 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2 2
3<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 3<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
4 xmlns:em="http://www.mozilla.org/2004/em-rdf#"> 4 xmlns:em="http://www.mozilla.org/2004/em-rdf#">
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,
12 with minimum and maximum supported versions. --> 12 with minimum and maximum supported versions. -->
13 <em:targetApplication> 13 <em:targetApplication>
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
21 <em:targetApplication> 21 <em:targetApplication>
22 <Description> 22 <Description>
23 <em:id>{a463f10c-3994-11da-9945-000d60ca027b}</em:id> 23 <em:id>{a463f10c-3994-11da-9945-000d60ca027b}</em:id>
24 <em:minVersion>0.5</em:minVersion> 24 <em:minVersion>0.5</em:minVersion>
25 <em:maxVersion>0.8</em:maxVersion> 25 <em:maxVersion>0.8</em:maxVersion>
26 </Description> 26 </Description>
27 </em:targetApplication> 27 </em:targetApplication>
28 28
29 29