From: Andy Allan Date: Wed, 13 Nov 2024 17:27:46 +0000 (+0000) Subject: Merge pull request #5158 from tomhughes/vagrant-debian X-Git-Tag: live~365 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a64b7237ec06264d26385e1384c3130bcbccd446?hp=5e26b33235bab027f25f98afb8db8980f3603b0b Merge pull request #5158 from tomhughes/vagrant-debian Switch vagrant to use Debian 12 --- diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 2b29992e9..4dfc849fe 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -25,8 +25,6 @@ //= require qs/dist/qs $(document).ready(function () { - var loaderTimeout; - var map = new L.OSM.Map("map", { zoomControl: false, layerControl: false, @@ -39,11 +37,7 @@ $(document).ready(function () { map.setSidebarOverlaid(false); - clearTimeout(loaderTimeout); - - loaderTimeout = setTimeout(function () { - $("#sidebar_loader").show(); - }, 200); + $("#sidebar_loader").show().addClass("delayed-fade-in"); // IE<10 doesn't respect Vary: X-Requested-With header, so // prevent caching the XHR response as a full-page URL. @@ -60,9 +54,8 @@ $(document).ready(function () { url: content_path, dataType: "html", complete: function (xhr) { - clearTimeout(loaderTimeout); $("#flash").empty(); - $("#sidebar_loader").hide(); + $("#sidebar_loader").removeClass("delayed-fade-in").hide(); var content = $(xhr.responseText); diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js index 59fbeeb1d..887ba043b 100644 --- a/app/assets/javascripts/index/new_note.js +++ b/app/assets/javascripts/index/new_note.js @@ -139,8 +139,6 @@ OSM.NewNote = function (map) { newNote.on("remove", function () { addNoteButton.removeClass("active"); - }).on("dragstart", function () { - $(newNote).stopTime("removenote"); }).on("dragend", function () { content.find("textarea").focus(); }); diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js index 0c0a69923..bd00d937e 100644 --- a/app/assets/javascripts/richtext.js +++ b/app/assets/javascripts/richtext.js @@ -8,7 +8,7 @@ var container = $(this).closest(".richtext_container"); var preview = container.find(".tab-pane[id$='_preview']"); - preview.children(".richtext_placeholder").attr("hidden", true); + preview.children(".richtext_placeholder").attr("hidden", true).removeClass("delayed-fade-in"); preview.children(".richtext").empty(); }); @@ -34,13 +34,10 @@ var preview = container.find(".tab-pane[id$='_preview']"); if (preview.children(".richtext").contents().length === 0) { - preview.oneTime(200, "loading", function () { - preview.children(".richtext_placeholder").removeAttr("hidden"); - }); + preview.children(".richtext_placeholder").removeAttr("hidden").addClass("delayed-fade-in"); preview.children(".richtext").load(editor.data("previewUrl"), { text: editor.val() }, function () { - preview.stopTime("loading"); - preview.children(".richtext_placeholder").attr("hidden", true); + preview.children(".richtext_placeholder").attr("hidden", true).removeClass("delayed-fade-in"); }); } }); diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 8dba773d8..73f8521d7 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -70,6 +70,18 @@ time[title] { } } +/* Utility for delayed loading spinner */ + +.delayed-fade-in { + animation: 300ms linear forwards delayed-fade-in; +} + +@keyframes delayed-fade-in { + 0% { opacity: 0 } + 66% { opacity: 0 } + 100% { opacity: 1 } +} + /* Rules for the header */ #menu-icon { diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index c42c2659d..d427e5fa5 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -29,7 +29,7 @@ class UserBlocksController < ApplicationController end def show - if current_user && current_user == @user_block.user + if current_user && current_user == @user_block.user && !@user_block.deactivates_at @user_block.needs_view = false @user_block.deactivates_at = [@user_block.ends_at, Time.now.utc].max @user_block.save! diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 1d89476ec..2ab90364e 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -147,14 +147,72 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_select "h1 a[href='#{user_path active_block.user}']", :text => active_block.user.display_name assert_select "h1 a[href='#{user_path active_block.creator}']", :text => active_block.creator.display_name assert UserBlock.find(active_block.id).needs_view + end - # Login as the blocked user - session_for(active_block.user) + ## + # test clearing needs_view by showing a zero-hour block to the blocked user + def test_show_sets_deactivates_at_for_zero_hour_block + user = create(:user) + session_for(user) - # Now viewing it should mark it as seen - get user_block_path(:id => active_block) - assert_response :success - assert_not UserBlock.find(active_block.id).needs_view + freeze_time do + block = create(:user_block, :needs_view, :zero_hour, :user => user) + assert block.needs_view + assert_nil block.deactivates_at + + travel 1.hour + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc, block.deactivates_at + + travel 1.hour + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc - 1.hour, block.deactivates_at + end + end + + ## + # test clearing needs_view by showing a timed block to the blocked user + def test_show_sets_deactivates_at_for_timed_block + user = create(:user) + session_for(user) + + freeze_time do + block = create(:user_block, :needs_view, :created_at => Time.now.utc, :ends_at => Time.now.utc + 24.hours, :user => user) + assert block.needs_view + assert_nil block.deactivates_at + + travel 1.hour + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc + 23.hours, block.deactivates_at + + travel 1.hour + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc + 22.hours, block.deactivates_at + + travel 24.hours + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc - 2.hours, block.deactivates_at + end end ##