From 1f70d36e74758fe1043bdec6687c1d258da064a0f431dbd279ece3f092e7c660 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Tue, 8 Sep 2026 17:54:34 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D0=BD?= =?UTF-8?q?=D0=B8=D0=B6=D0=BD=D1=8E=D1=8E=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?= =?UTF-8?q?=D1=83=20=D0=B2=20=D0=BA=D0=B0=D0=BD=D0=B0=D0=BB=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION.properties | 2 +- bundle-offline.sh | 19 ++++++++++++++++++- shine-UI/js/pages/channels-list.js | 16 +--------------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/VERSION.properties b/VERSION.properties index 595a0b57..778037b3 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.12.0 +client.version=1.12.1 server.version=1.10.0 diff --git a/bundle-offline.sh b/bundle-offline.sh index 2144f43d..07c1b329 100755 --- a/bundle-offline.sh +++ b/bundle-offline.sh @@ -123,6 +123,23 @@ find_offline_gradle_zip() { fi done + local extracted_dir="" + if [[ -d "$HOME/.gradle/wrapper/dists/gradle-8.14-bin" ]]; then + extracted_dir="$(find "$HOME/.gradle/wrapper/dists/gradle-8.14-bin" -type d -name 'gradle-8.14' | sort | head -n 1 || true)" + fi + if [[ -n "$extracted_dir" && -d "$extracted_dir" ]]; then + local generated_zip="$TMP/gradle-offline.zip" + ( + cd "$(dirname -- "$extracted_dir")" + rm -f -- "$generated_zip" + zip -qr "$generated_zip" "gradle-8.14" + ) + if [[ -f "$generated_zip" ]]; then + printf '%s\n' "$generated_zip" + return 0 + fi + fi + return 1 } @@ -269,7 +286,7 @@ if OFFLINE_ZIP_SRC="$(find_offline_gradle_zip)"; then OFFLINE_ZIP_NAME="gradle-offline.zip" else echo "ERROR: offline Gradle zip not found." >&2 - echo "Place it at ./offline/gradle-offline.zip or set BUNDLE_OFFLINE_GRADLE_ZIP." >&2 + echo "Place it at ./offline/gradle-offline.zip, set BUNDLE_OFFLINE_GRADLE_ZIP, or install Gradle 8.14 locally." >&2 echo "The bundle is not created because this variant is meant to be offline-ready." >&2 exit 4 fi diff --git a/shine-UI/js/pages/channels-list.js b/shine-UI/js/pages/channels-list.js index 0aa9ad82..f72bf1ec 100644 --- a/shine-UI/js/pages/channels-list.js +++ b/shine-UI/js/pages/channels-list.js @@ -1094,14 +1094,6 @@ function renderListContent({ screen, container, listState, navigate, refreshFeed container.append(list); } -function updateBottomCta({ button }) { - if (!button) return; - button.hidden = true; - button.textContent = ''; - button.className = 'channels-bottom-action'; - button.onclick = null; -} - async function loadFeedAndRender({ screen, listState, contentEl, navigate }) { renderSkeletonList(contentEl, 5); @@ -1215,9 +1207,6 @@ export function render({ navigate, route, chrome }) { }); const topMenuBtn = topBarEl.querySelector('.channels-top-more-btn'); - const bottomCta = document.createElement('button'); - bottomCta.type = 'button'; - const reloadFeed = async () => loadFeedAndRender({ screen, listState, contentEl, navigate }); const rerenderList = () => { @@ -1234,18 +1223,15 @@ export function render({ navigate, route, chrome }) { topTitle.textContent = channelsViewTitle(listState.viewMode); topMenuBtn.style.display = ''; - updateBottomCta({ button: bottomCta }); }; chrome?.setTopbar(topBarEl); - screen.append(contentEl, bottomCta); + screen.append(contentEl); if (createSuccessFlash) { showToast(createSuccessFlash); } - updateBottomCta({ button: bottomCta }); - // Применяем корректное состояние хедера сразу на первом рендере, // чтобы не показывать лишние кнопки до первой перерисовки. rerenderList();