From 26be597cb27e5096ad7627ccb5ada58d9607b871 Mon Sep 17 00:00:00 2001 From: mak Date: Tue, 10 Jun 2014 18:34:31 +0200 Subject: [PATCH] enable SkeletonJson to load Objects (not just Strings) --- spine-as3/spine-as3/src/spine/SkeletonJson.as | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spine-as3/spine-as3/src/spine/SkeletonJson.as b/spine-as3/spine-as3/src/spine/SkeletonJson.as index b0dc28f37..a8871690d 100644 --- a/spine-as3/spine-as3/src/spine/SkeletonJson.as +++ b/spine-as3/spine-as3/src/spine/SkeletonJson.as @@ -69,18 +69,19 @@ public class SkeletonJson { if (object == null) throw new ArgumentError("object cannot be null."); - var json:String; + var root:Object if (object is String) - json = String(object); + root = JSON.parse(String(object)); else if (object is ByteArray) - json = object.readUTFBytes(object.length); + root = JSON.parse(object.readUTFBytes(object.length)); + else if (object is Object) + root = object; else - throw new ArgumentError("object must be a String or ByteArray."); + throw new ArgumentError("object must be a String, ByteArray or Object."); var skeletonData:SkeletonData = new SkeletonData(); skeletonData.name = name; - var root:Object = JSON.parse(json); // Bones. var boneData:BoneData;