colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 21:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed readFile for Rhino (return JavaScript string instead of Java string)

Browse Source 
[#66 state:resolved responsible:tlrobinson]
This commit is contained in:
Tom Robinson
2008-09-22 16:20:00 -07:00
parent 59e16f9e61
commit dff3b249d9
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/Utilities/bridge.js
+8 -9
View File
@@ -107,11 +107,11 @@ if (typeof readFile == "undefined") {
var f = new Packages.java.io.File(path);
if (!f.canRead()) {
//alert("can't read: " + f.path)
alert("can't read: " + f.path)
return "";
}
//alert("reading: " + f.getAbsolutePath());
alert("reading: " + f.getAbsolutePath());
var fis = new Packages.java.io.FileInputStream(f);
@@ -119,12 +119,11 @@ if (typeof readFile == "undefined") {
fis.read(b);
fis.close();
//return String(new Packages.java.lang.String(b));
if (characterCoding)
return new Packages.java.lang.String(b, characterCoding);
return String(new Packages.java.lang.String(b, characterCoding));
else
return new Packages.java.lang.String(b);
return String(new Packages.java.lang.String(b));
}
}
else {
@@ -451,9 +450,9 @@ XMLHttpRequest.prototype.send = function(body) {
try {
this.responseText = readFile(this.url);
alert("xhr: " + this.url);
alert("xhr response: " + this.url + " (length="+this.responseText.length+")");
} catch (e) {
alert("read exception: " + this.url);
alert("xhr exception: " + this.url);
this.responseText = "";
this.responseXML = null;
}
@@ -467,7 +466,7 @@ XMLHttpRequest.prototype.send = function(body) {
this.status = 200;
}
else {
alert("empty file: " + this.url);
alert("xhr empty: " + this.url);
this.status = 404;
}