Skip to content

Commit

Permalink
Data attribute names should be dasherized
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 11, 2012
1 parent f468170 commit 38b7377
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
class Kandan.Collections.Activities extends Backbone.Collection

url: ()->
"channels/#{@channel_id}/activities"
"channels/#{@channelId}/activities"

initialize: (models, options)->
@channel_id = options.channel_id
@channelId = options.channel_id

parse: (response)->
@more_activities = response.more_activities
@moreActivities = response.more_activities
response.activities
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class Kandan.Collections.Attachments extends Backbone.Collection
url: ()->
"/channels/#{@channel_id}/attachments"
"/channels/#{@channelId}/attachments"

initialize: (models, options)->
@channel_id = options.channel_id
@channelId = options.channelId
2 changes: 1 addition & 1 deletion app/assets/javascripts/backbone/data/attachments.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Kandan.Data.Attachments

@all: (callback)->
attachments = new Kandan.Collections.Attachments([], {
channel_id: Kandan.Data.Channels.activeChannelId()
channelId: Kandan.Data.Channels.activeChannelId()
})
attachments.fetch({ success: callback })

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ class Kandan.Helpers.Channels
$("#kandan").tabs("option", "selected")

@getActiveChannelId: ()->
if $(document).data('active_channel_id') == undefined
if $(document).data('active-channel-id') == undefined
return $("#kandan .ui-tabs-panel")
.eq(@selectedTab())
.data("channel_id")
else
return $(document).data("active_channel_id")
return $(document).data("active-channel-id")


@confirmDeletion: ()->
Expand All @@ -44,7 +44,7 @@ class Kandan.Helpers.Channels
$channelActivities = $("#channel-activities-#{channelId}")
if $channelActivities.children().length == @options.maxActivities + 1
$channelActivities.children().first().remove()
oldest = $channelActivities.children().first().data("activity_id")
oldest = $channelActivities.children().first().data("activity-id")
$channelActivities.prev().data("oldest", oldest)
@channelPaginationEl(channelId).show()

Expand Down Expand Up @@ -144,4 +144,4 @@ class Kandan.Helpers.Channels
@setPaginationData: (channelId)->
$oldestActivity = @channelActivitiesEl(channelId).find(".activity").first()
if $oldestActivity.length != 0
@channelPaginationEl(channelId).data("oldest", $oldestActivity.data("activity_id"))
@channelPaginationEl(channelId).data("oldest", $oldestActivity.data("activity-id"))
2 changes: 1 addition & 1 deletion app/assets/javascripts/backbone/kandan.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ window.Kandan =
initTabs: ()->
$('#kandan').tabs({
select: (event, ui)->
$(document).data('active_channel_id',
$(document).data('active-channel-id',
Kandan.Helpers.Channels.getChannelIdByTabIndex(ui.index))
Kandan.Data.Channels.runCallbacks('change')
add: (event, ui) ->
Expand Down
3 changes: 0 additions & 3 deletions app/assets/javascripts/backbone/models/activity.js.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
class Kandan.Models.Activity extends Backbone.Model
url: ()->
"channels/#{@get('channel_id')}/activities"

initialize: (options)->
@channel_id = @get('channel_id')
7 changes: 2 additions & 5 deletions app/assets/javascripts/backbone/models/channel.js.coffee
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
class Kandan.Models.Channel extends Backbone.Model
urlRoot: '/channels'

# initialize: ()->
# console.log @activities

parse: (response)->
@more_activities = false
@moreActivities = false
if response.activities
activities = new Kandan.Collections.Activities([], {channel_id: response.id})
activities.add(response.activities)
@activities = activities
@more_activities = response.more_activities
@moreActivities = response.more_activities
response
3 changes: 0 additions & 3 deletions app/assets/javascripts/backbone/models/user.js.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
class Kandan.Models.User extends Backbone.Model
urlRoot: '/users'

initialize: ()->
console.log "initialized user"
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ class Kandan.Views.PaginatedActivities extends Backbone.View
setPagination: ()->
oldestActivityId = 0
if @channel.activities and @channel.activities.models.length > 0
oldestActivityId = _.first(@channel.activities.models).get('id')
oldestActivityId = _.first(@channel.activities.models).get("id")

$(@el).find(".pagination").data('oldest', oldestActivityId)
$(@el).find(".pagination").data("oldest", oldestActivityId)


render: ()->
@channel = @options.channel
$(@el).html @template()
@setPagination()

$(@el).find(".pagination").hide() if @channel.more_activities != true
$(@el).find(".pagination").hide() if @channel.moreActivities != true
listActivitiesView = new Kandan.Views.ListActivities({channel: @channel})
$(@el).append listActivitiesView.render().el
@


loadMoreActivities: ()->
oldest = $(@el).find(".pagination").data('oldest')
activities = new Kandan.Collections.Activities([], {channel_id: @channel.get('id')})
oldest = $(@el).find(".pagination").data("oldest")
activities = new Kandan.Collections.Activities([], {channel_id: @channel.get("id")})
activities.fetch({
data: { oldest: oldest },
success: (collection)=>
Expand All @@ -37,8 +37,8 @@ class Kandan.Views.PaginatedActivities extends Backbone.View
$(@el).find(".channel-activities").prepend(activityView.render().el)

Kandan.Helpers.Channels.setPaginationState(
collection.channel_id,
collection.more_activities,
_.last(collection.models).get('id')
collection.channelId,
collection.moreActivities,
_.last(collection.models).get("id")
)
})
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Kandan.Views.ShowActivity extends Backbone.View
else
@compiledTemplate = Kandan.Helpers.Activities.buildFromMessageTemplate $.extend(activity, {content: _.escape(activity.content)})

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

0 comments on commit 38b7377

Please sign in to comment.