Skip to content

Support for native Flash Player 11 JSON Object #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ElliotChong wants to merge 1 commit into
base: 0.7.x
Choose a base branch
from
Open

Support for native Flash Player 11 JSON Object #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions src/com/pnwrain/flashsocket/FlashSocket.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.pnwrain.flashsocket
{
import com.adobe.serialization.json.JSON;
import com.pnwrain.flashsocket.events.FlashSocketEvent;

import flash.events.Event;
Expand Down Expand Up @@ -245,19 +244,19 @@ package com.pnwrain.flashsocket
break;
case '4':
var fe:FlashSocketEvent = new FlashSocketEvent(FlashSocketEvent.MESSAGE);
fe.data = JSON.decode(dm.msg);
fe.data = JSON.parse(dm.msg);
dispatchEvent(fe);
break;
case '5':
var m:Object = JSON.decode(dm.msg);
var m:Object = JSON.parse(dm.msg);
var e:FlashSocketEvent = new FlashSocketEvent(m.name);
e.data = m.args;
dispatchEvent(e);
break;
case '6':
var parts:Object = this.ackRegexp.exec(dm.msg);
var id:int = int(parts[1]);
var args:Array = JSON.decode(parts[2]);
var args:Array = JSON.parse(parts[2]) as Array;
if (this.acks.hasOwnProperty(id)) {
var func:Function = this.acks[id] as Function;
//pass however many args the function is looking for back to it
Expand Down Expand Up @@ -323,12 +322,12 @@ package com.pnwrain.flashsocket
//webSocket.send(_encode(msg));
webSocket.send('3:'+messageId+'::' + msg as String);
}else if ( msg is Object ){
webSocket.send('4:'+messageId+'::' + JSON.encode(msg));
webSocket.send('4:'+messageId+'::' + JSON.stringify(msg));
}else{
throw("Unsupported Message Type");
}
}else{
webSocket.send('5:'+messageId+'::' + JSON.encode({"name":event,"args":msg}));
webSocket.send('5:'+messageId+'::' + JSON.stringify({"name":event,"args":msg}));
}
}

Expand Down