-
Notifications
You must be signed in to change notification settings - Fork 405
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Akash Manohar J <akash@akash.im>
- Loading branch information
Showing
16 changed files
with
112 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
app/assets/javascripts/backbone/views/channel_pane.js.coffee
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
class Kandan.Views.ChannelPane extends Backbone.View | ||
tagName: 'div' | ||
|
||
render: ()-> | ||
@channel = @options.channel | ||
|
||
paginatedActivitiesView = new Kandan.Views.PaginatedActivities({channel: @channel}) | ||
$(@el).html paginatedActivitiesView.render().el | ||
|
||
chatbox = new Kandan.Views.Chatbox({channel: @channel}) | ||
$(@el).append chatbox.render().el | ||
|
||
$(@el).attr "id", "channels-#{@channel.get("id")}" | ||
$(@el).data "channel_id", @channel.get('id') | ||
@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 5 additions & 32 deletions
37
app/assets/javascripts/backbone/views/list_activities.js.coffee
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,18 @@ | ||
class Kandan.Views.ListActivities extends Backbone.View | ||
tagName: 'div' | ||
# className: 'activities' | ||
|
||
events: { | ||
"click .pagination": "load_more_activities" | ||
} | ||
className: 'channel-activities' | ||
|
||
render: ()-> | ||
@channel = @options.channel | ||
$activities_list = $("<div class='channel-activities'></div>").attr('id', "channel-activities-#{@channel.get('id')}") | ||
$(@el).attr('id', "channel-activities-#{@channel.get('id')}") | ||
oldest = 0 | ||
|
||
if @channel.activities | ||
console.log "channel has activities" | ||
for activity in @channel.activities.models | ||
activity_view = new Kandan.Views.ShowActivity({activity: activity, state: Kandan.Helpers.Activities.HISTORY_STATE}) | ||
$activities_list.append(activity_view.render().el) | ||
oldest = @channel.activities.toJSON()[0].id if @channel.activities.toJSON()[0] | ||
|
||
$pagination = $("<div class='pagination'>previous messages</div>") | ||
activityView = new Kandan.Views.ShowActivity({activity: activity, state: Kandan.Helpers.Activities.HISTORY_STATE}) | ||
$(@el).append(activityView.render().el) | ||
|
||
$pagination.data('oldest', oldest) | ||
$(@el).append($pagination) | ||
$(@el).find(".pagination").hide() if @channel.more_activities != true | ||
$(@el).append($activities_list) | ||
$(@el).attr('id', "channels-#{@channel.get('id')}") | ||
$(@el).data('channel_id', @channel.get('id')) | ||
$(@el).prev().hide() if @channel.more_activities != true | ||
@ | ||
|
||
load_more_activities: ()-> | ||
oldest = $(@el).find(".pagination").data('oldest') | ||
activities = new Kandan.Collections.Activities([], {channel_id: @channel.get('id')}) | ||
activities.fetch({ | ||
data: { oldest: oldest }, | ||
success: (collection)=> | ||
_.each collection.models.reverse(), (activity)=> | ||
activity_view = new Kandan.Views.ShowActivity({activity: activity}) | ||
$(@el).find(".channel-activities").prepend(activity_view.render().el) | ||
Kandan.Helpers.Channels.set_pagination_state( | ||
collection.channel_id, | ||
collection.more_activities, | ||
_.last(collection.models).get('id') | ||
) | ||
}) |
44 changes: 44 additions & 0 deletions
44
app/assets/javascripts/backbone/views/paginated_activities.js.coffee
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
class Kandan.Views.PaginatedActivities extends Backbone.View | ||
|
||
tagName: 'div' | ||
className: 'paginated_activities' | ||
template: JST['paginated_activities'] | ||
|
||
events: | ||
"click .pagination": "load_more_activities" | ||
|
||
setPagination: ()-> | ||
oldestActivityId = 0 | ||
if @channel.activities and @channel.activities.models.length > 0 | ||
oldestActivityId = _.last(@channel.activities.models).get('id') | ||
|
||
$(@el).find(".pagination").data('oldest', oldestActivityId) | ||
|
||
|
||
render: ()-> | ||
@channel = @options.channel | ||
$(@el).html @template() | ||
@setPagination() | ||
|
||
listActivitiesView = new Kandan.Views.ListActivities({channel: @channel}) | ||
$(@el).append listActivitiesView.render().el | ||
@ | ||
|
||
|
||
load_more_activities: ()-> | ||
oldest = $(@el).find(".pagination").data('oldest') | ||
activities = new Kandan.Collections.Activities([], {channel_id: @channel.get('id')}) | ||
activities.fetch({ | ||
data: { oldest: oldest }, | ||
success: (collection)=> | ||
for activity in collection.models.reverse() | ||
activityView = new Kandan.Views.ShowActivity({activity: activity}) | ||
$(@el).find(".channel-activities").prepend(activityView.render().el) | ||
|
||
Kandan.Helpers.Channels.set_pagination_state( | ||
collection.channel_id, | ||
collection.more_activities, | ||
_.last(collection.models).get('id') | ||
) | ||
}) | ||
|
4 changes: 0 additions & 4 deletions
4
app/assets/stylesheets/activity.css.scss → app/assets/stylesheets/_activity.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,3 @@ | ||
// | ||
// Activity | ||
// | ||
|
||
.activity { | ||
float: left; | ||
width: 100%; | ||
|
18 changes: 0 additions & 18 deletions
18
app/assets/stylesheets/base.css.scss → app/assets/stylesheets/_base.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
app/assets/stylesheets/sidebar.css.scss → app/assets/stylesheets/_sidebar.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
$panel-bg: #E6EBEE; | ||
$chatbox-bg-1: #F3F8F9; | ||
$chatbox-bg-2: #DBDFE0; | ||
|
||
$header-height: 30px; | ||
$header-bg-1: #566569; | ||
$header-bg-2: #3F494B; | ||
|
||
$widget-title-color: #7F8587; | ||
$widget-title-bg-1: #F3F8F9; | ||
$widget-title-bg-2: #DBDFE0; | ||
|
||
$sidebar-width: 20%; | ||
$sidebar-bg: #E6EBEE; | ||
|
||
$search-bg: #5D676B; | ||
$search-color: #CCC; | ||
|
||
$page-bg: #E6EBEE; | ||
$main-area-width: 80%; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 1 addition & 5 deletions
6
.../stylesheets/plugins/attachments.css.scss → ...ets/stylesheets/plugins/_attachments.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
...ts/stylesheets/plugins/user_list.css.scss → ...ssets/stylesheets/plugins/_user_list.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,3 @@ | ||
// | ||
// UserList plugin | ||
// | ||
|
||
.user_list { | ||
padding-bottom: 10px; | ||
float: left; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<textarea class="chatbox"></textarea> | ||
<button class="post-button">Post</button> | ||
<textarea></textarea> | ||
<button>Post</button> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
<div class="pagination">previous messages</div> |