Commit 07eec9c6 authored by Riyad Preukschas's avatar Riyad Preukschas

Update Notes JS for reversed notes

parent 7563abbe
......@@ -4,14 +4,17 @@ var NoteList = {
target_params: null,
target_id: 0,
target_type: null,
top_id: 0,
bottom_id: 0,
loading_more_disabled: false,
reversed: false,
init:
function(tid, tt, path) {
this.notes_path = path + ".js";
this.target_id = tid;
this.target_type = tt;
this.reversed = $("#notes-list").hasClass("reversed");
this.target_params = "&target_type=" + this.target_type + "&target_id=" + this.target_id;
// get initial set of notes
......@@ -69,12 +72,18 @@ var NoteList = {
* Replaces the content of #notes-list with the given html.
*/
setContent:
function(last_id, html) {
function(first_id, last_id, html) {
this.top_id = first_id;
this.bottom_id = last_id;
$("#notes-list").html(html);
// Init infinite scrolling
// init infinite scrolling
this.initLoadMore();
// init getting new notes
if (this.reversed) {
this.initRefreshNew();
}
},
......@@ -114,7 +123,7 @@ var NoteList = {
$.ajax({
type: "GET",
url: this.notes_path,
data: "loading_more=1&after_id=" + this.bottom_id + this.target_params,
data: "loading_more=1&" + (this.reversed ? "before_id" : "after_id") + "=" + this.bottom_id + this.target_params,
complete: function(){ $('.notes-status').removeClass("loading")},
beforeSend: function() { $('.notes-status').addClass("loading") },
dataType: "script"});
......@@ -142,7 +151,9 @@ var NoteList = {
this.loading_more_disabled = true;
// from now on only get new notes
this.initRefreshNew();
if (!this.reversed) {
this.initRefreshNew();
}
},
......@@ -164,14 +175,14 @@ var NoteList = {
},
/**
* Gets the new set of notes (i.e. all notes after ).
* Gets the new set of notes.
*/
getNew:
function() {
$.ajax({
type: "GET",
url: this.notes_path,
data: "loading_new=1&after_id=" + this.bottom_id + this.target_params,
data: "loading_new=1&after_id=" + (this.reversed ? this.top_id : this.bottom_id) + this.target_params,
dataType: "script"});
},
......@@ -189,7 +200,9 @@ var NoteList = {
*/
appendNewNote:
function(id, html) {
if(id != this.bottom_id) {
if (this.reversed) {
$("#new-notes-list").prepend(html);
} else {
$("#new-notes-list").append(html);
}
}
......
......@@ -4,6 +4,7 @@ module Notes
target_type = params[:target_type]
target_id = params[:target_id]
after_id = params[:after_id]
before_id = params[:before_id]
@notes = case target_type
......@@ -17,14 +18,16 @@ module Notes
project.snippets.find(target_id).notes.fresh
when "wall"
# this is the only case, where the order is DESC
project.common_notes.order("created_at DESC").limit(50)
project.common_notes.order("created_at DESC, id DESC").limit(50)
when "wiki"
project.wikis.reverse.map {|w| w.notes.fresh }.flatten[0..20]
end
@notes = if after_id
@notes.where("id > ?", after_id)
else
elsif before_id
@notes.where("id < ?", before_id)
else
@notes
end
end
......
......@@ -36,7 +36,7 @@ class Note < ActiveRecord::Base
scope :today, where("created_at >= :date", date: Date.today)
scope :last_week, where("created_at >= :date", date: (Date.today - 7.days))
scope :since, lambda { |day| where("created_at >= :date", date: (day)) }
scope :fresh, order("created_at ASC")
scope :fresh, order("created_at ASC, id ASC")
scope :inc_author_project, includes(:project, :author)
scope :inc_author, includes(:author)
......
......@@ -9,7 +9,7 @@
- else
:plain
NoteList.setContent(#{@notes.last.id}, "#{escape_javascript(render 'notes/notes')}");
NoteList.setContent(#{@notes.first.id}, #{@notes.last.id}, "#{escape_javascript(render 'notes/notes')}");
- else
- if loading_more_notes?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment