fix NewPage for #702

upgrade jquery-selectors, disable csp, fixed unfinite loop in PeopleDataProvider
wicketstuff · Dec 14, 2020 · b294c2d · b294c2d
1 parent cfbfec7
commit b294c2d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/...nt/datatables-examples/src/main/java/org/wicketstuff/datatables/demo/DemoApplication.java b/...nt/datatables-examples/src/main/java/org/wicketstuff/datatables/demo/DemoApplication.java
@@ -47,6 +47,8 @@ protected void init() {
         getMarkupSettings().setStripWicketTags(true);
 
 	    configureResourceGuard();
+
+	    getCspSettings().blocking().disabled();
     }
 
 	private void configureResourceGuard() {

diff --git a/...datatables-examples/src/main/java/org/wicketstuff/datatables/demo/PeopleDataProvider.java b/...datatables-examples/src/main/java/org/wicketstuff/datatables/demo/PeopleDataProvider.java
@@ -28,23 +28,25 @@ public Iterator<? extends Person> iterator(long first, long count) {
         List<Person> people = new ArrayList<>();
         Random random = new Random(123);
 
-        for (int i = 0; i < count;) {
+        for (int i = 0; i < FIRST_NAMES.length * LAST_NAMES.length; i++) {
             int randomFirst = random.nextInt(FIRST_NAMES.length);
             int randomLast = random.nextInt(LAST_NAMES.length);
             int randomAge = random.nextInt(99);
             final String firstName = FIRST_NAMES[randomFirst];
             final String lastName = LAST_NAMES[randomLast];
-            if (searchFilter != null && (firstName.toLowerCase().contains(searchFilter) || lastName.toLowerCase().contains(searchFilter) )) {
+            if (searchFilter == null || (firstName.toLowerCase().contains(searchFilter) || lastName.toLowerCase().contains(searchFilter) )) {
                 people.add(new Person(firstName, lastName, randomAge, first + i));
-                i++;
+            }
+            if (people.size() >= count) {
+            	break;
             }
         }
         return people.iterator();
     }
 
     @Override
     public long size() {
-        return FIRST_NAMES.length;
+        return FIRST_NAMES.length * LAST_NAMES.length;
     }
 
     @Override

diff --git a/datatables-parent/datatables/pom.xml b/datatables-parent/datatables/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>de.agilecoders.wicket</groupId>
 			<artifactId>jquery-selectors</artifactId>
-			<version>3.0.0-M4</version>
+			<version>3.0.2</version>
 		</dependency>
 	</dependencies>
 </project>