diff options
| -rw-r--r-- | app/assets/javascripts/extensions/array.js | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js | 39 | ||||
| -rw-r--r-- | app/views/notes/index.js.haml | 7 |
3 files changed, 31 insertions, 22 deletions
diff --git a/app/assets/javascripts/extensions/array.js b/app/assets/javascripts/extensions/array.js new file mode 100644 index 00000000000..7fccc9c9d5f --- /dev/null +++ b/app/assets/javascripts/extensions/array.js @@ -0,0 +1,7 @@ +Array.prototype.first = function() { + return this[0]; +} + +Array.prototype.last = function() { + return this[this.length-1]; +}
\ No newline at end of file diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 91215fdbcbe..f6a27c7ec6a 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -89,12 +89,12 @@ var NoteList = { getContent: function() { $.ajax({ - type: "GET", - url: this.notes_path, - data: this.target_params, - complete: function(){ $('.notes-status').removeClass("loading")}, - beforeSend: function() { $('.notes-status').addClass("loading") }, - dataType: "script"}); + url: this.notes_path, + data: this.target_params, + complete: function(){ $('.notes-status').removeClass("loading")}, + beforeSend: function() { $('.notes-status').addClass("loading") }, + dataType: "script" + }); }, /** @@ -102,9 +102,9 @@ var NoteList = { * Replaces the content of #notes-list with the given html. */ setContent: - function(first_id, last_id, html) { - this.top_id = first_id; - this.bottom_id = last_id; + function(newNoteIds, html) { + this.top_id = newNoteIds.first(); + this.bottom_id = newNoteIds.last(); $("#notes-list").html(html); // init infinite scrolling @@ -151,12 +151,12 @@ var NoteList = { // only load more notes if there are no "new" notes $('.loading').show(); $.ajax({ - type: "GET", url: this.notes_path, data: this.target_params + "&loading_more=1&" + (this.reversed ? "before_id" : "after_id") + "=" + this.bottom_id, complete: function(){ $('.notes-status').removeClass("loading")}, beforeSend: function() { $('.notes-status').addClass("loading") }, - dataType: "script"}); + dataType: "script" + }); }, /** @@ -164,9 +164,10 @@ var NoteList = { * Append notes to #notes-list. */ appendMoreNotes: - function(id, html) { - if(id != this.bottom_id) { - this.bottom_id = id; + function(newNoteIds, html) { + var lastNewNoteId = newNoteIds.last(); + if(lastNewNoteId != this.bottom_id) { + this.bottom_id = lastNewNoteId; $("#notes-list").append(html); } }, @@ -212,10 +213,10 @@ var NoteList = { getNew: function() { $.ajax({ - type: "GET", - url: this.notes_path, - data: this.target_params + "&loading_new=1&after_id=" + (this.reversed ? this.top_id : this.bottom_id), - dataType: "script"}); + url: this.notes_path, + data: this.target_params + "&loading_new=1&after_id=" + (this.reversed ? this.top_id : this.bottom_id), + dataType: "script" + }); }, /** @@ -223,7 +224,7 @@ var NoteList = { * Replaces the content of #new-notes-list with the given html. */ replaceNewNotes: - function(html) { + function(newNoteIds, html) { $("#new-notes-list").html(html); this.updateVotes(); }, diff --git a/app/views/notes/index.js.haml b/app/views/notes/index.js.haml index 99da619c649..cf46af6523b 100644 --- a/app/views/notes/index.js.haml +++ b/app/views/notes/index.js.haml @@ -1,15 +1,16 @@ - unless @notes.blank? + - new_note_ids = @notes.map(&:id) - if loading_more_notes? :plain - NoteList.appendMoreNotes(#{@notes.last.id}, "#{escape_javascript(render 'notes/notes')}"); + NoteList.appendMoreNotes(#{new_note_ids}, "#{escape_javascript(render 'notes/notes')}"); - elsif loading_new_notes? :plain - NoteList.replaceNewNotes("#{escape_javascript(render 'notes/notes')}"); + NoteList.replaceNewNotes(#{new_note_ids}, "#{escape_javascript(render 'notes/notes')}"); - else :plain - NoteList.setContent(#{@notes.first.id}, #{@notes.last.id}, "#{escape_javascript(render 'notes/notes')}"); + NoteList.setContent(#{new_note_ids}, "#{escape_javascript(render 'notes/notes')}"); - else - if loading_more_notes? |