Skip to content

Commit 295e1ee

Browse files
committed
More casing changes
Signed-off-by: Akash Manohar J <akash@akash.im>
1 parent c0d0fab commit 295e1ee

File tree

7 files changed

+30
-29
lines changed

7 files changed

+30
-29
lines changed

app/assets/javascripts/backbone/helpers/activities.js.coffee

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ class Kandan.Helpers.Activities
44
@ACTIVE_STATE: "ACTIVE"
55
@HISTORY_STATE: "HISTORY"
66

7-
@build_from_base_template: (activity)->
7+
@buildFromBaseTemplate: (activity)->
88
JST['activity_base']({activity: activity})
99

10-
@build_from_message_template: (activity)->
10+
@buildFromMessageTemplate: (activity)->
1111
JST['message']({activity: activity})

app/assets/javascripts/backbone/helpers/utils.js.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Kandan.Helpers.Utils
2020
,"December"
2121
]
2222

23-
@time_to_string: (time) ->
23+
@timeToString: (time) ->
2424
return time if (typeof time != "object")
2525
am = time.getHours() < 12
2626
hours = time.getHours()

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ class Kandan.Plugins.ImageEmbed
1919
imageUrl: message.content,
2020
name: fileName
2121
})
22-
return Kandan.Helpers.Activities.build_from_message_template(message)
22+
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ class Kandan.Plugins.LinkEmbed
66
Kandan.Modifiers.register @options.regex, (message, state)=>
77
message.content = message.content
88
.replace(@options.regex, '<a target="_blank" href="$1">$1</a>')
9-
return Kandan.Helpers.Activities.build_from_message_template(message)
9+
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ class Kandan.Plugins.Pastie
2424
Kandan.Modifiers.register @options.regex, (message, state) =>
2525
url = "/channels/#{message.channel_id}/activities/#{message.id}"
2626
message.content = @options.template({preview: @truncate(message.content), messageLink: url})
27-
return Kandan.Helpers.Activities.build_from_message_template(message)
27+
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)
2828

2929
# Kandan.Plugins.register "Kandan.Plugins.Pastie"
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
class Kandan.Plugins.YouTubeEmbed
22

3-
@youtube_regex: /^http(s)?:\/\/www.youtube.com\/watch/i
4-
@youtube_id_regex: /\Wv=([\w|\-]*)/
3+
@options:
4+
regex: /^http(s)?:\/\/www.youtube.com\/watch/i
5+
idRegex: /\Wv=([\w|\-]*)/
56

6-
@youtube_embed_template: _.template '''
7-
<div class="youtube-preview">
8-
<a target="_blank" class="youtube-preview-link" href="<%= video_url %>">
9-
<img class="youtube-preview-image" src="<%= thumb_url %>" />
10-
</a>
11-
</div>
12-
'''
7+
template: _.template '''
8+
<div class="youtube-preview">
9+
<a target="_blank" class="youtube-preview-link" href="<%= videoUrl %>">
10+
<img class="youtube-preview-image" src="<%= thumbUrl %>" />
11+
</a>
12+
</div>
13+
'''
1314

1415
@init: ()->
15-
Kandan.Modifiers.register @youtube_regex, (message, state)=>
16-
video_id = message.content.match(@youtube_id_regex)[1]
17-
thumb_url = "http://img.youtube.com/vi/#{ video_id }/0.jpg"
18-
message.content = @youtube_embed_template({
19-
video_url: message.content,
20-
thumb_url: thumb_url
16+
Kandan.Modifiers.register @options.regex, (message, state)=>
17+
videoId = message.content.match(@options.idRegex)[1]
18+
thumbUrl = "http://img.youtube.com/vi/#{ videoId }/0.jpg"
19+
message.content = @options.template({
20+
videoUrl: message.content,
21+
thumbUrl: thumbUrl
2122
})
22-
return Kandan.Helpers.Activities.build_from_message_template(message)
23+
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)

app/assets/javascripts/backbone/views/show_activity.js.coffee

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ class Kandan.Views.ShowActivity extends Backbone.View
55

66
render: ()->
77
activity = @options.activity.toJSON()
8-
activity.created_at = Kandan.Helpers.Utils.time_to_string(new Date(activity.created_at))
8+
activity.created_at = Kandan.Helpers.Utils.timeToString(new Date(activity.created_at))
99
if activity.action != "message"
10-
@compiled_template = JST['user_notification']({activity: activity})
10+
@compiledTemplate = JST['user_notification']({activity: activity})
1111
else
12-
modified_message = Kandan.Modifiers.process(activity, @options.state)
13-
if modified_message != false
14-
@compiled_template = modified_message
12+
modifiedMessage = Kandan.Modifiers.process(activity, @options.state)
13+
if modifiedMessage != false
14+
@compiledTemplate = modifiedMessage
1515
else
16-
@compiled_template = Kandan.Helpers.Activities.build_from_message_template $.extend(activity, {content: _.escape(activity.content)})
16+
@compiledTemplate = Kandan.Helpers.Activities.buildFromMessageTemplate $.extend(activity, {content: _.escape(activity.content)})
1717

1818
$(@el).data('activity_id', activity.id)
1919
$(@el).attr('id', "activity-#{activity.id}")
20-
$(@el).html(@compiled_template)
20+
$(@el).html(@compiledTemplate)
2121
@

0 commit comments

Comments
 (0)