cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changeset <ol>s on Load more

Browse source
This commit is contained in:
Anton Khorev 2022-10-26 15:02:49 +03:00
parent 3d0b94abda
commit 34a8d08209
2 changed files with 58 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/assets/javascripts/index/history.js
View file

@ -43,6 +43,18 @@ OSM.History = function (map) {
$("#changeset_" + id).find("a.changeset_id").simulate("click", e);
}
function displayFirstChangesets(html) {
$("#sidebar_content .changesets").html(html);
}
function displayMoreChangesets(html) {
$("#sidebar_content .changeset_more").replaceWith(html);
var oldList = $("#sidebar_content .changesets ol").first();
var newList = oldList.next("ol");
newList.children().appendTo(oldList);
newList.remove();
}
function update() {
var data = { list: "1" };
@ -58,7 +70,7 @@ OSM.History = function (map) {
method: "GET",
data: data,
success: function (html) {
$("#sidebar_content .changesets").html(html);
displayFirstChangesets(html);
updateMap();
}
});
@ -73,8 +85,8 @@ OSM.History = function (map) {
$(this).hide();
div.find(".loader").show();
$.get($(this).attr("href"), function (data) {
div.replaceWith(data);
$.get($(this).attr("href"), function (html) {
displayMoreChangesets(html);
updateMap();
});
}

43
test/system/history_test.rb
View file

@ -1,6 +1,8 @@
require "application_system_test_case"
class HistoryTest < ApplicationSystemTestCase
PAGE_SIZE = 20
test "atom link on user's history is not modified" do
user = create(:user)
create(:changeset, :user => user, :num_changes => 1) do |changeset|
@ -13,4 +15,45 @@ class HistoryTest < ApplicationSystemTestCase
assert_css "link[type='application/atom+xml'][href$='#{user_path(user)}/history/feed']", :visible => false
end
test "have only one list element on user's changesets page" do
user = create(:user)
create_visible_changeset(user, "first-changeset-in-history")
create_visible_changeset(user, "bottom-changeset-in-batch-2")
(PAGE_SIZE - 1).times do
create_visible_changeset(user, "next-changeset")
end
create_visible_changeset(user, "bottom-changeset-in-batch-1")
(PAGE_SIZE - 1).times do
create_visible_changeset(user, "next-changeset")
end
visit "#{user_path(user)}/history"
changesets = find "div.changesets"
changesets.assert_text "bottom-changeset-in-batch-1"
changesets.assert_no_text "bottom-changeset-in-batch-2"
changesets.assert_no_text "first-changeset-in-history"
changesets.assert_selector "ol", :count => 1
changesets.assert_selector "li", :count => PAGE_SIZE
changesets.find(".changeset_more a.btn").click
changesets.assert_text "bottom-changeset-in-batch-1"
changesets.assert_text "bottom-changeset-in-batch-2"
changesets.assert_no_text "first-changeset-in-history"
changesets.assert_selector "ol", :count => 1
changesets.assert_selector "li", :count => 2 * PAGE_SIZE
changesets.find(".changeset_more a.btn").click
changesets.assert_text "bottom-changeset-in-batch-1"
changesets.assert_text "bottom-changeset-in-batch-2"
changesets.assert_text "first-changeset-in-history"
changesets.assert_selector "ol", :count => 1
changesets.assert_selector "li", :count => (2 * PAGE_SIZE) + 1
end
def create_visible_changeset(user, comment)
create(:changeset, :user => user, :num_changes => 1) do |changeset|
create(:changeset_tag, :changeset => changeset, :k => "comment", :v => comment)
end
end
end