mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-10-06 17:12:50 +00:00
Fix for responseXML not working correctly from remote.
Reviewed by me.
This commit is contained in:
1 parent
a4d73330cc
commit
8a2206656d
2 files changed
+23
-5
No files matched your search
@@ -97,17 +97,24 @@ HTTPRequest.prototype.responseXML = function()
|
||||
{
|
||||
var responseXML = this._nativeRequest.responseXML;
|
||||
|
||||
if (!responseXML && window.ActiveXObject)
|
||||
if (responseXML)
|
||||
return responseXML;
|
||||
|
||||
var responseText = this.responseText();
|
||||
|
||||
if (window.ActiveXObject)
|
||||
{
|
||||
var responseText = this.responseText(),
|
||||
XMLData = new ActiveXObject("Microsoft.XMLDOM");
|
||||
var XMLData = new ActiveXObject("Microsoft.XMLDOM");
|
||||
|
||||
XMLData.loadXML(responseText.substr(responseText.indexOf(".dtd\">") + 6));
|
||||
|
||||
return XMLData;
|
||||
}
|
||||
|
||||
return responseXML;
|
||||
if (window.DOMParser)
|
||||
return new DOMParser().parseFromString(responseText, "text/xml");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
HTTPRequest.prototype.responsePropertyList = function()
|
||||
@@ -125,7 +132,7 @@ HTTPRequest.prototype.responseText = function()
|
||||
return this._nativeRequest.responseText;
|
||||
}
|
||||
|
||||
var methods = ["open", "send", "abort", "setRequestHeader", "getResponseHeader", "getAllResponseHeaders"],
|
||||
var methods = ["open", "send", "abort", "setRequestHeader", "getResponseHeader", "getAllResponseHeaders", "overrideMimeType"],
|
||||
count = methods.length;
|
||||
|
||||
while (count--)
|
||||
@@ -182,6 +189,9 @@ function FileRequest(/*String*/ aFilePath, onsuccess, onfailure)
|
||||
request.onsuccess = onsuccess;
|
||||
request.onfailure = onfailure;
|
||||
|
||||
if (request.overrideMimeType && FILE.extension(aFilePath) === ".plist")
|
||||
request.overrideMimeType("text/xml");
|
||||
|
||||
request.open("GET", aFilePath, YES);
|
||||
request.send("");
|
||||
#else
|
||||
|
||||
@@ -21,6 +21,14 @@ require("file");
|
||||
return components[components.length - 1];
|
||||
},
|
||||
|
||||
extension: function(/*String*/ aPath)
|
||||
{
|
||||
aPath = FILE.basename(aPath);
|
||||
aPath = aPath.replace(/^\.*/, '');
|
||||
var index = aPath.lastIndexOf(".");
|
||||
return index <= 0 ? "" : aPath.substring(index);
|
||||
},
|
||||
|
||||
cwd: function()
|
||||
{
|
||||
return FILE.dirname(window.location.pathname);
|
||||
|
||||
Reference in new issue
Block a user