From 55fef154f8c80fbc7a7fa9b6df2b208a71c7cb7d Mon Sep 17 00:00:00 2001 From: Dustin Colvin Date: Wed, 20 Nov 2024 20:56:40 -0600 Subject: [PATCH] removing pagination on playlists --- current/all/pom.xml | 2 +- current/analyse/pom.xml | 2 +- current/core/pom.xml | 2 +- current/it.tests/pom.xml | 2 +- current/pom.xml | 2 +- current/ui.apps.structure/pom.xml | 2 +- current/ui.apps/pom.xml | 2 +- .../clientlibs/clientlib-tools/js/brcUI.js | 67 ++++++++++--------- .../brightcoveadmin/brightcoveadmin.html | 6 +- current/ui.config/pom.xml | 2 +- current/ui.content/pom.xml | 2 +- current/ui.tests/pom.xml | 2 +- 12 files changed, 48 insertions(+), 45 deletions(-) diff --git a/current/all/pom.xml b/current/all/pom.xml index c1396de..9d314dc 100644 --- a/current/all/pom.xml +++ b/current/all/pom.xml @@ -24,7 +24,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml diff --git a/current/analyse/pom.xml b/current/analyse/pom.xml index e974af2..f220256 100644 --- a/current/analyse/pom.xml +++ b/current/analyse/pom.xml @@ -23,7 +23,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml diff --git a/current/core/pom.xml b/current/core/pom.xml index 85d3f6a..25f4947 100644 --- a/current/core/pom.xml +++ b/current/core/pom.xml @@ -20,7 +20,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml brightcove.core diff --git a/current/it.tests/pom.xml b/current/it.tests/pom.xml index 5096342..0941d16 100644 --- a/current/it.tests/pom.xml +++ b/current/it.tests/pom.xml @@ -20,7 +20,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml diff --git a/current/pom.xml b/current/pom.xml index 96ceee0..a5034a1 100644 --- a/current/pom.xml +++ b/current/pom.xml @@ -21,7 +21,7 @@ com.coresecure brightcove pom - 6.1.8 + 6.1.9 Brightcove Connector diff --git a/current/ui.apps.structure/pom.xml b/current/ui.apps.structure/pom.xml index 75ff942..3969f08 100644 --- a/current/ui.apps.structure/pom.xml +++ b/current/ui.apps.structure/pom.xml @@ -8,7 +8,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml diff --git a/current/ui.apps/pom.xml b/current/ui.apps/pom.xml index e2102ad..ed914c9 100644 --- a/current/ui.apps/pom.xml +++ b/current/ui.apps/pom.xml @@ -23,7 +23,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml diff --git a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-tools/js/brcUI.js b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-tools/js/brcUI.js index 1f919f8..6976ed5 100644 --- a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-tools/js/brcUI.js +++ b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-tools/js/brcUI.js @@ -794,6 +794,7 @@ function buildPlaylistList() { document.getElementById('searchDiv').style.display = "none"; document.getElementById('searchDiv_pl').style.display = "inline"; document.getElementById('checkToggle').style.display = "none"; + document.getElementById('pagination').style.display = "none"; $("span[name=buttonRow]").hide(); $(":button[name=delFromPlstButton]").hide(); @@ -1968,38 +1969,40 @@ function stopPreview() { //type should be playlists or videos function doPageList(total, type) { - if (total > paging.size) { - var numOpt = Math.ceil(total / paging.size); - var select = document.getElementsByName("selPageN"); - var options = ""; - for (var i = 0; i < numOpt; i++) { - options += ''; - } else { - options += 'Page ' + (i+1) + ' (' + type + ' ' + (i * paging.size + 1) + ' to ' + ((i + 1) * paging.size) + ' )'; - } - } - //remove previous options, add the new ones and select the current page in the option list - $("select[name=selPageN]").empty().append(options).children("[id=" + paging.generic/paging.size + "]").each(function () { - //need to try/catch for IE6 - try { - this.selected = true; - } catch (e) { - } - }); - $("div[name=pageDiv]").show(); - document.getElementById('tdOne').appendChild(document.getElementById('searchDiv')); - } else { - document.getElementById('divVideoCount').innerHTML = total + ' ' + type + ' (of ' + total + ' )'; - $("div[name=pageDiv]").hide(); - //If there's no page selector, move the search bar down so it doesn't stick out ofplace - document.getElementById('tdTwo').appendChild(document.getElementById('searchDiv')); - } + if (type !== "Playlists") { + if (total > paging.size) { + var numOpt = Math.ceil(total / paging.size); + var select = document.getElementsByName("selPageN"); + var options = ""; + for (var i = 0; i < numOpt; i++) { + options += ''; + } else { + options += 'Page ' + (i+1) + ' (' + type + ' ' + (i * paging.size + 1) + ' to ' + ((i + 1) * paging.size) + ' )'; + } + } + //remove previous options, add the new ones and select the current page in the option list + $("select[name=selPageN]").empty().append(options).children("[id=" + paging.generic/paging.size + "]").each(function () { + //need to try/catch for IE6 + try { + this.selected = true; + } catch (e) { + } + }); + $("div[name=pageDiv]").show(); + document.getElementById('tdOne').appendChild(document.getElementById('searchDiv')); + } else { + document.getElementById('divVideoCount').innerHTML = total + ' ' + type + ' (of ' + total + ' )'; + $("div[name=pageDiv]").hide(); + //If there's no page selector, move the search bar down so it doesn't stick out ofplace + document.getElementById('tdTwo').appendChild(document.getElementById('searchDiv')); + } + } } function changePage(num) { diff --git a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/tools/brightcoveadmin/brightcoveadmin.html b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/tools/brightcoveadmin/brightcoveadmin.html index 7abe601..9ba830d 100644 --- a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/tools/brightcoveadmin/brightcoveadmin.html +++ b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/tools/brightcoveadmin/brightcoveadmin.html @@ -137,7 +137,7 @@ From Playlist -
Page Number: + @@ -180,10 +180,10 @@ From Playlist
-
+ diff --git a/current/ui.config/pom.xml b/current/ui.config/pom.xml index b572bc6..49b8c76 100644 --- a/current/ui.config/pom.xml +++ b/current/ui.config/pom.xml @@ -23,7 +23,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml diff --git a/current/ui.content/pom.xml b/current/ui.content/pom.xml index 559e323..09c33d6 100644 --- a/current/ui.content/pom.xml +++ b/current/ui.content/pom.xml @@ -23,7 +23,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml diff --git a/current/ui.tests/pom.xml b/current/ui.tests/pom.xml index 2bc7f5f..d5e3ba5 100644 --- a/current/ui.tests/pom.xml +++ b/current/ui.tests/pom.xml @@ -25,7 +25,7 @@ com.coresecure brightcove - 6.1.8 + 6.1.9 ../pom.xml