diff --git a/static/js/dynamic_loading_routes.js b/static/js/dynamic_loading_routes.js index bee7468..09eece3 100644 --- a/static/js/dynamic_loading_routes.js +++ b/static/js/dynamic_loading_routes.js @@ -1,6 +1,7 @@ page_iterator = 2 standart_page_iterator = 1 separator_iterator = 1 +iterator_f_check = 1 function load_routes (el,news=null) { let local_page_iterator = standart_page_iterator @@ -8,12 +9,12 @@ function load_routes (el,news=null) { local_page_iterator = page_iterator } let number_last_route = el.id - let incrase = 3 + let incrase = 2 if (!news){ - incrase = 11 + incrase = 10 } let data_d = { - 'from_el':parseInt(number_last_route) + 1, + 'from_el':parseInt(number_last_route), 'to_el':parseInt(number_last_route) + incrase } let get_url = "" @@ -65,7 +66,10 @@ function load_routes (el,news=null) { place_ins.innerHTML = data.html let old_page_iterator = local_page_iterator + // standart_page_iterator++ local_page_iterator++ + page_iterator++ + standart_page_iterator++ loader.classList.toggle("show") if (!data.last_block_routes){ el.classList.toggle("hide") @@ -81,12 +85,31 @@ function load_routes (el,news=null) { $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); let line_separator = document.createElement("div") line_separator.classList.add("line_separator_page_w_el") - $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator); + + if (news){ + if (iterator_f_check === 1){ + // + } else { + $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator); + separator_iterator++ + } + } else { + $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator); + separator_iterator++ + } + // document.querySelector(".info_profile").innerHTML = data.html; - el.setAttribute("id",parseInt(number_last_route) + 11) + el.setAttribute("id",parseInt(number_last_route) + incrase) history.pushState({'data':data_d,'str_data':get_url}, "state_filters", `?${get_url}`); - separator_iterator++ // number_last_route = parseInt(number_last_route) + "11" + iterator_f_check++ + if (data.last_block === true){ + el.classList.add("hide") + } else if (data.last_block === false){ + if (el.classList.contains("hide")) { + el.classList.remove("hide") + } + } }, error: function (data){ diff --git a/templates/blocks/articles/b_news_elements_content.html b/templates/blocks/articles/b_news_elements_content.html index c96df6c..d3925c1 100644 --- a/templates/blocks/articles/b_news_elements_content.html +++ b/templates/blocks/articles/b_news_elements_content.html @@ -3,5 +3,4 @@