[wicket] branch master updated: WICKET-6683 let events bubble

[svenmeier]

This is an automated email from the ASF dual-hosted git repository.

svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new f48d752  WICKET-6683 let events bubble
f48d752 is described below

commit f48d752aed5554bc043f433fab456260ada17ac9
Author: Sven Meier <svenme...@apache.org>
AuthorDate: Sun Jul 7 19:49:01 2019 +0200

    WICKET-6683 let events bubble
    
    and prevent multiple occurences of countries in example
---
 .../java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java  | 2 +-
 .../extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js     | 2 +-
 .../org/apache/wicket/extensions/markup/html/form/palette/palette.js    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
index 7e2aecd..87fa149 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
@@ -88,7 +88,7 @@ public class AutoCompletePage extends BasePage
                                {
                                        final String country = 
locale.getDisplayCountry();
 
-                                       if 
(country.toUpperCase(Locale.ROOT).startsWith(input.toUpperCase(Locale.ROOT)))
+                                       if (!choices.contains(country) && 
country.toUpperCase(Locale.ROOT).startsWith(input.toUpperCase(Locale.ROOT)))
                                        {
                                                choices.add(country);
                                                if (choices.size() == 10)
diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
index cabc3b4..dc140d4 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
@@ -444,7 +444,7 @@
                        
                        if (triggerChangeOnHide) {
                                var input = Wicket.$(ajaxAttributes.c);
-                               jQuery(input).triggerHandler('change');
+                               jQuery(input).trigger('change');
                                triggerChangeOnHide = false;
                        }
                }
diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js
index 90bd6f7..16ec014 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js
@@ -124,7 +124,7 @@
                        }
                }
 
-               jQuery(recorder).triggerHandler('change');
+               jQuery(recorder).trigger('change');
        };
 
        Wicket.Palette.clearSelectionHelper=function(box) {