From 01d72c5f451b6ba35582156bba9dce9d935dc546 Mon Sep 17 00:00:00 2001 From: SBD Date: Wed, 29 Nov 2023 18:28:31 +0300 Subject: [PATCH] 0.8.427 --- ArticlesApp/funcs.py | 2 +- static/js/dynamic_loading_routes.js | 45 ++++++++++++++++++----------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ArticlesApp/funcs.py b/ArticlesApp/funcs.py index 2d92211..cf4d137 100644 --- a/ArticlesApp/funcs.py +++ b/ArticlesApp/funcs.py @@ -1,7 +1,7 @@ from .models import * -elements_on_page = 4 +elements_on_page = 1 def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None): diff --git a/static/js/dynamic_loading_routes.js b/static/js/dynamic_loading_routes.js index bfe97a5..7c2f31e 100644 --- a/static/js/dynamic_loading_routes.js +++ b/static/js/dynamic_loading_routes.js @@ -62,28 +62,27 @@ function load_routes (el,news=null,incrase) { document.querySelector(".col_vo_els_f_load").innerHTML = ` ${data.next_page_els_count}` } - let place_ins_parent = el.closest(".block_w_paging") - let place_ins = place_ins_parent.querySelector(`.page_paging_elements_${local_page_iterator}`) + // // let place_ins = el if (news && standart_page_iterator === 1){ page_iterator++ - standart_page_iterator++ - let new_page_routes = document.createElement("div") - let old_page_iterator = local_page_iterator - new_page_routes.classList.add("page_paging_elements_" + standart_page_iterator) - $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); - old_page_iterator++ - let line_separator = document.createElement("div") - line_separator.classList.add("line_separator_page_w_el") + let old_page_iterator = standart_page_iterator + let new_page_routes = document.querySelector(".page_paging_elements_1") + // let new_page_routes = document.createElement("div") + // let old_page_iterator = local_page_iterator + // new_page_routes.classList.add("page_paging_elements_" + standart_page_iterator--) + // $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); + // old_page_iterator++ + // let line_separator = document.createElement("div") + // line_separator.classList.add("line_separator_page_w_el") new_page_routes.innerHTML = data.html local_page_iterator++ - local_page_iterator++ - standart_page_iterator++ + separator_iterator++ let new_page_routes1 = document.createElement("div") new_page_routes1.classList.add("page_paging_elements_" + local_page_iterator) - $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); + $(new_page_routes1).insertAfter(".page_paging_elements_" + old_page_iterator); let line_separator1 = document.createElement("div") line_separator1.classList.add("line_separator_page_w_el") el.setAttribute("id",parseInt(number_last_route) + incrase) @@ -92,20 +91,31 @@ function load_routes (el,news=null,incrase) { iterator_f_check++ iterator_f_check++ if (data.last_block === true){ - el.classList.add("hide") + el.classList.add("hide") } else if (data.last_block === false){ if (el.classList.contains("hide")) { el.classList.remove("hide") } } + page_iterator++ + standart_page_iterator++ + separator_iterator++ + iterator_f_check++ document.querySelector(".loader_f_loading_routes.show").classList.remove("show") } else { + page_iterator++ + standart_page_iterator++ + separator_iterator++ + iterator_f_check++ + let place_ins_parent = el.closest(".block_w_paging") + let place_ins = place_ins_parent.querySelector(`.page_paging_elements_${local_page_iterator}`) + if (!place_ins){ + place_ins = place_ins_parent.querySelector(`.page_paging_elements_${local_page_iterator}`) + } + 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") @@ -116,6 +126,7 @@ function load_routes (el,news=null,incrase) { // behavior:"smooth" // } // ) + local_page_iterator++ let new_page_routes = document.createElement("div") new_page_routes.classList.add("page_paging_elements_" + local_page_iterator) $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator);