Skip to content

Commit

Permalink
Minor fixes and also removes some logging
Browse files Browse the repository at this point in the history
Signed-off-by: Akash Manohar J <[email protected]>
  • Loading branch information
HashNuke committed Apr 4, 2012
1 parent 7d77d15 commit 81a6faf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
7 changes: 4 additions & 3 deletions app/assets/javascripts/backbone/broadcasters/faye.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class Kandan.Broadcasters.FayeBroadcaster

@faye_client.subscribe "/app/activities", (data)=>
[entityName, eventName] = data.event.split("#")
processEventsForUser(eventName, data) if entityName == "user"
processEventsForUser(eventName, data) if entityName == "channel"
@processEventsForUser(eventName, data) if entityName == "user"
@processEventsForUser(eventName, data) if entityName == "channel"


processEventsForUser: (eventName, data)->
Expand All @@ -38,6 +38,7 @@ class Kandan.Broadcasters.FayeBroadcaster
subscribe: (channel)->
subscription = @faye_client.subscribe channel, (data)=>
Kandan.Helpers.Channels.add_activity(data)
subscription.errback(()->
subscription.errback((data)->
console.log "error", data
alert "Oops! could not connect to the server"
)
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class Kandan.Plugins.UserList
$el.next().hide();

for user in Kandan.Data.ActiveUsers.all()
console.log "hash", user.gravatar_hash
$users.append @template({
name: "#{user.first_name} #{user.last_name}",
gravatar_hash: user.gravatar_hash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ class Kandan.Views.ListActivities extends Backbone.View
oldest = 0

if @channel.activities
console.log "channel has activities"
for activity in @channel.activities.models
activityView = new Kandan.Views.ShowActivity({activity: activity, state: Kandan.Helpers.Activities.HISTORY_STATE})
$(@el).append(activityView.render().el)

$(@el).prev().hide() if @channel.more_activities != true
@

0 comments on commit 81a6faf

Please sign in to comment.