Skip to content

Commit

Permalink
More casing changes
Browse files Browse the repository at this point in the history
Signed-off-by: Akash Manohar J <akash@akash.im>
  • Loading branch information
HashNuke committed Apr 11, 2012
1 parent c0d0fab commit 295e1ee
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 29 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/backbone/helpers/activities.js.coffee
Expand Up @@ -4,8 +4,8 @@ class Kandan.Helpers.Activities
@ACTIVE_STATE: "ACTIVE"
@HISTORY_STATE: "HISTORY"

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

@build_from_message_template: (activity)->
@buildFromMessageTemplate: (activity)->
JST['message']({activity: activity})
2 changes: 1 addition & 1 deletion app/assets/javascripts/backbone/helpers/utils.js.coffee
Expand Up @@ -20,7 +20,7 @@ class Kandan.Helpers.Utils
,"December"
]

@time_to_string: (time) ->
@timeToString: (time) ->
return time if (typeof time != "object")
am = time.getHours() < 12
hours = time.getHours()
Expand Down
Expand Up @@ -19,4 +19,4 @@ class Kandan.Plugins.ImageEmbed
imageUrl: message.content,
name: fileName
})
return Kandan.Helpers.Activities.build_from_message_template(message)
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)
Expand Up @@ -6,4 +6,4 @@ class Kandan.Plugins.LinkEmbed
Kandan.Modifiers.register @options.regex, (message, state)=>
message.content = message.content
.replace(@options.regex, '<a target="_blank" href="$1">$1</a>')
return Kandan.Helpers.Activities.build_from_message_template(message)
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)
2 changes: 1 addition & 1 deletion app/assets/javascripts/backbone/plugins/pastie.js.coffee
Expand Up @@ -24,6 +24,6 @@ class Kandan.Plugins.Pastie
Kandan.Modifiers.register @options.regex, (message, state) =>
url = "/channels/#{message.channel_id}/activities/#{message.id}"
message.content = @options.template({preview: @truncate(message.content), messageLink: url})
return Kandan.Helpers.Activities.build_from_message_template(message)
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)

# Kandan.Plugins.register "Kandan.Plugins.Pastie"
33 changes: 17 additions & 16 deletions app/assets/javascripts/backbone/plugins/youtube_embed.js.coffee
@@ -1,22 +1,23 @@
class Kandan.Plugins.YouTubeEmbed

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

@youtube_embed_template: _.template '''
<div class="youtube-preview">
<a target="_blank" class="youtube-preview-link" href="<%= video_url %>">
<img class="youtube-preview-image" src="<%= thumb_url %>" />
</a>
</div>
'''
template: _.template '''
<div class="youtube-preview">
<a target="_blank" class="youtube-preview-link" href="<%= videoUrl %>">
<img class="youtube-preview-image" src="<%= thumbUrl %>" />
</a>
</div>
'''

@init: ()->
Kandan.Modifiers.register @youtube_regex, (message, state)=>
video_id = message.content.match(@youtube_id_regex)[1]
thumb_url = "http://img.youtube.com/vi/#{ video_id }/0.jpg"
message.content = @youtube_embed_template({
video_url: message.content,
thumb_url: thumb_url
Kandan.Modifiers.register @options.regex, (message, state)=>
videoId = message.content.match(@options.idRegex)[1]
thumbUrl = "http://img.youtube.com/vi/#{ videoId }/0.jpg"
message.content = @options.template({
videoUrl: message.content,
thumbUrl: thumbUrl
})
return Kandan.Helpers.Activities.build_from_message_template(message)
return Kandan.Helpers.Activities.buildFromMessageTemplate(message)
14 changes: 7 additions & 7 deletions app/assets/javascripts/backbone/views/show_activity.js.coffee
Expand Up @@ -5,17 +5,17 @@ class Kandan.Views.ShowActivity extends Backbone.View

render: ()->
activity = @options.activity.toJSON()
activity.created_at = Kandan.Helpers.Utils.time_to_string(new Date(activity.created_at))
activity.created_at = Kandan.Helpers.Utils.timeToString(new Date(activity.created_at))
if activity.action != "message"
@compiled_template = JST['user_notification']({activity: activity})
@compiledTemplate = JST['user_notification']({activity: activity})
else
modified_message = Kandan.Modifiers.process(activity, @options.state)
if modified_message != false
@compiled_template = modified_message
modifiedMessage = Kandan.Modifiers.process(activity, @options.state)
if modifiedMessage != false
@compiledTemplate = modifiedMessage
else
@compiled_template = Kandan.Helpers.Activities.build_from_message_template $.extend(activity, {content: _.escape(activity.content)})
@compiledTemplate = Kandan.Helpers.Activities.buildFromMessageTemplate $.extend(activity, {content: _.escape(activity.content)})

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

0 comments on commit 295e1ee

Please sign in to comment.