@@ -32,7 +32,7 @@ package fb { import flash.net.URLRequest; import flash.net.URLRequestMethod; import flash.net.URLVariables; - + import mx.utils.ObjectUtil; import mx.controls.HTML; public class FBAPI { @@ -121,15 +121,14 @@ package fb { callCount++; var urlArgs:URLVariables = new URLVariables(); - if (callArgs) { - for (var key:String in callArgs) { - if (callArgs[key] is Array) { + if (callArgs) + for (var key:String in callArgs) + if (!ObjectUtil.isSimple(callArgs[key])) + urlArgs[key] = JSON.encode(callArgs[key]); + else if (callArgs[key] is Array) urlArgs[key] = callArgs[key].join(","); - } else { + else urlArgs[key] = callArgs[key]; - } - } - } urlArgs['v'] = '1.0'; urlArgs['format'] = 'JSON'; fb/FBAPI.as @@ -210,13 +210,14 @@ // We build our fql query here to call restserver.php. // {"order by time desc"} allows us to ensure we get the newest, in order. // {"and time > " + latestUpdate} allows us to just get deltas. - var query:JSONLoader = FBAPI.callMethod("fql.query", { - query:"select post_id, source_id, created_time, actor_id, " + + var query:JSONLoader = FBAPI.callMethod("fql.multiquery", { + queries:{stream:"select post_id, source_id, created_time, actor_id, " + "target_id, app_id, message, attachment, comments, likes, " + "permalink, attribution, type, filter_key " + "from stream where " + requested_filters.join(" or ") + " " + - "order by created_time desc" + "order by created_time desc", + comments:"select post_id, id, fromid, text, time, "} }); query.addEventListener(FBEvent.SUCCESS, updatesReturned); query.addEventListener(FBEvent.RETRY, queryRetried); @@ -230,7 +231,11 @@ // Called every time we have new updates from the server private function updatesReturned(event:FBEvent):void { - data = event.data; + var resultsByKey:Object = new Object(); + for each (var result:Object in event.data) + resultsByKey[result.name] = result.results; + + data = resultsByKey.stream; if (dataCache[CurrentFilter]) addEventListener(Event.ENTER_FRAME, afterUpdatesReturned); } fbair/nile/NileContainer.mxml @@ -190,12 +190,11 @@ // Now lets bind to the count to see when to refetch commentCount = data.comments.count; if (countWatcher) countWatcher.unwatch(); - countWatcher = BindingUtils.bindSetter(function(new_count:int):void { - callLater(updatedCommentCount, [new_count]); - }, data, ["comments", "count"]); + countWatcher = BindingUtils.bindSetter(updateCommentCount, + data, ["comments", "count"]); } - private function updatedCommentCount(new_count:int):void { + private function updateCommentCount(new_count:int):void { // If we have more than max, then display link allCommentsContainer.visible = (new_count > MaxComments); fbair/nile/renderers/CommentsRenderer.mxml @@ -1,3 +1,18 @@ +/* + Copyright Facebook Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ package fbair.util.display { import mx.containers.Box; fbair/util/display/FlowBox.as @@ -1,14 +1,18 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// ADOBE SYSTEMS INCORPORATED -// Copyright 2005-2006 Adobe Systems Incorporated -// All Rights Reserved. -// -// NOTICE: Adobe permits you to use, modify, and distribute this file -// in accordance with the terms of the license agreement accompanying it. -// -//////////////////////////////////////////////////////////////////////////////// +/* + Copyright Facebook Inc. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ package fbair.util.display.layout { import mx.styles.IStyleClient; fbair/util/display/layout/FlowBoxLayout.as c90c261b1a6990a31ad9c61819d0b1a9e0fa5c44 Justin Bishop jubishop@gmail.com http://github.com/jubishop/Facebook-for-Adobe-AIR/commit/d90ff7b3b0d189e07cbb950ae05a9b9b23cd6ebf d90ff7b3b0d189e07cbb950ae05a9b9b23cd6ebf 2009-06-08T14:24:43-07:00 2009-06-08T14:24:43-07:00 functionally using multiquery, but to no advantage yet. :/ 42af4d7e71405dab5a88188ad81a3586e4bc6f81 Justin Bishop jubishop@gmail.com