removing pagination on playlists

brightcove · Nov 21, 2024 · 55fef15 · 55fef15
1 parent 28cc461
commit 55fef15
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 45 deletions.
diff --git a/current/all/pom.xml b/current/all/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/analyse/pom.xml b/current/analyse/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/core/pom.xml b/current/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brightcove.core</artifactId>

diff --git a/current/it.tests/pom.xml b/current/it.tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/pom.xml b/current/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.coresecure</groupId>
     <artifactId>brightcove</artifactId>
     <packaging>pom</packaging>
-    <version>6.1.8</version>
+    <version>6.1.9</version>
     <description>Brightcove Connector</description>
 
     <modules>

diff --git a/current/ui.apps.structure/pom.xml b/current/ui.apps.structure/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/ui.apps/pom.xml b/current/ui.apps/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/.../ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-tools/js/brcUI.js b/.../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 += '<option style="width:100%" id="' + i + '">';
-            if (paging.generic == i) {
-                num = (numOpt - 1 == i) ? (total - i * paging.size) : paging.size;
-                document.getElementById('divVideoCount').innerHTML = num + ' ' + type + ' (of ' + total + ')';
-            }
-            if (numOpt - 1 == i) {
-                options += 'Page ' + (i+1) + ' (' + type + ' ' + (i * paging.size + 1) + ' to ' + total + ' )</option>';
-            } else {
-                options += 'Page ' + (i+1) + ' (' + type + ' ' + (i * paging.size + 1) + ' to ' + ((i + 1) * paging.size) + ' )</option>';
-            }
-        }
-        //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 += '<option style="width:100%" id="' + i + '">';
+	            if (paging.generic == i) {
+	                num = (numOpt - 1 == i) ? (total - i * paging.size) : paging.size;
+	                document.getElementById('divVideoCount').innerHTML = num + ' ' + type + ' (of ' + total + ')';
+	            }
+	            if (numOpt - 1 == i) {
+	                options += 'Page ' + (i+1) + ' (' + type + ' ' + (i * paging.size + 1) + ' to ' + total + ' )</option>';
+	            } else {
+	                options += 'Page ' + (i+1) + ' (' + type + ' ' + (i * paging.size + 1) + ' to ' + ((i + 1) * paging.size) + ' )</option>';
+	            }
+	        }
+	        //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/...in/content/jcr_root/apps/brightcove/components/tools/brightcoveadmin/brightcoveadmin.html b/...in/content/jcr_root/apps/brightcove/components/tools/brightcoveadmin/brightcoveadmin.html
@@ -137,7 +137,7 @@
                                                     From Playlist
                                                 </button>
                                             </div>
-                                            <div name="pageDiv" class="pageDiv">Page Number:
+                                            <div id="pagination" name="pageDiv" class="pageDiv">Page Number:
                                                 <select name="selPageN" onchange="changePage(this.selectedIndex)"></select>
                                             </div>
                                         </td>
@@ -180,10 +180,10 @@
                                                     From Playlist
                                                 </button>
                                             </div>
-                                            <div name="pageDiv" class="pageDiv">
+                                            <!-- <div name="pageDiv" class="pageDiv">
                                                 Page Number:
                                                 <select name="selPageN" onchange="changePage(this.selectedIndex)"></select>
-                                            </div>
+                                            </div> -->
                                         </td>
                                     </tr>
                                 </table>

diff --git a/current/ui.config/pom.xml b/current/ui.config/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/ui.content/pom.xml b/current/ui.content/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/ui.tests/pom.xml b/current/ui.tests/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>