Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/mloader/HttpLoader.hx
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,19 @@ class HttpLoader<T> extends LoaderBase<T>
// default content type
var contentType = "application/octet-stream";

if (Std.is(data, Xml))
if (Std.isOfType(data, Xml))
{
// convert to string and send as application/xml
data = Std.string(data);
contentType = "application/xml";
}
else if (!Std.is(data, String))
else if (!Std.isOfType(data, String))
{
// stringify and send as application/json
data = haxe.Json.stringify(data);
contentType = "application/json";
}
else if (Std.is(data, String) && validateJSONdata(data))
else if (Std.isOfType(data, String) && validateJSONdata(data))
{
//data is already a valid JSON string
contentType = "application/json";
Expand Down
4 changes: 2 additions & 2 deletions test/mloader/XmlLoaderTest.hx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class XmlLoaderTest
loader.load();

Assert.isTrue(Type.enumEq(events[0].type, Complete));
Assert.isTrue(Std.is(loader.content, Xml));
Assert.isTrue(Std.isOfType(loader.content, Xml));
Assert.areEqual(xml.toString(), loader.content.toString());
}

Expand All @@ -98,7 +98,7 @@ class XmlLoaderTest


Assert.isTrue(Type.enumEq(events[0].type, Complete));
Assert.isTrue(Std.is(loader.content, Xml));
Assert.isTrue(Std.isOfType(loader.content, Xml));
Assert.areEqual(xml.firstChild().toString(), loader.content.toString());
}

Expand Down