Skip to content

Commit c0d0fab

Browse files
committed
Fixes pastie
Signed-off-by: Akash Manohar J <[email protected]>
1 parent 42e95cb commit c0d0fab

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

app/assets/javascripts/backbone/kandan.js.coffee

+6-5
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,16 @@ window.Kandan =
100100
template = JST['current_user']
101101
currentUser = Kandan.Helpers.Users.currentUser()
102102
$(".header .user").html template({
103-
gravatar_hash: currentUser.gravatar_hash,
103+
gravatarHash: currentUser.gravatar_hash,
104104
name: "#{currentUser.first_name} #{currentUser.last_name}"
105105
})
106106

107107
init: ->
108108
@setCurrentUser()
109109
channels = new Kandan.Collections.Channels()
110-
channels.fetch({success: (channelsCollection)=>
111-
@initBroadcasterAndSubscribe()
112-
activeUsers = new Kandan.Collections.ActiveUsers()
113-
activeUsers.fetch({success: @onFetchActiveUsers(channelsCollection)})
110+
channels.fetch({
111+
success: (channelsCollection)=>
112+
@initBroadcasterAndSubscribe()
113+
activeUsers = new Kandan.Collections.ActiveUsers()
114+
activeUsers.fetch({success: @onFetchActiveUsers(channelsCollection)})
114115
})

app/assets/javascripts/backbone/plugins/pastie.js.coffee

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ class Kandan.Plugins.Pastie
1616
originalLength = content.length
1717
content = content.split("/n").slice(0, @options.maxPreviewLines) if content.split("\n") > @options.maxPreviewLines
1818
content = content.substring(0, @options.maxPreviewLength) if content.length > @options.maxPreviewLines
19-
return "#{content}..." if content.length == originalLength
19+
return "#{content}..." if content.length != originalLength
2020
content
2121

2222

2323
@init: ->
2424
Kandan.Modifiers.register @options.regex, (message, state) =>
2525
url = "/channels/#{message.channel_id}/activities/#{message.id}"
26-
message.content = @options.template({preview: (message.content), messageLink: url})
26+
message.content = @options.template({preview: @truncate(message.content), messageLink: url})
2727
return Kandan.Helpers.Activities.build_from_message_template(message)
2828

2929
# Kandan.Plugins.register "Kandan.Plugins.Pastie"
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<img src="http://gravatar.com/avatar/<%= @gravatar_hash %>?s=25&d=http://bushi.do/images/profile.png"/>
1+
<img src="http://gravatar.com/avatar/<%= @gravatarHash %>?s=25&d=http://bushi.do/images/profile.png"/>
22
<span><%= @name %></span>

0 commit comments

Comments
 (0)