Updated Branches: refs/heads/wicket-1.5.x 31a695336 -> aec2c742e
added forgotten fixEvent calls Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aec2c742 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aec2c742 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aec2c742 Branch: refs/heads/wicket-1.5.x Commit: aec2c742e03a3d0fd455cfd5dc4a550d44ecdaa1 Parents: 31a6953 Author: Johan Compagner <[email protected]> Authored: Tue Sep 4 09:01:03 2012 +0200 Committer: Johan Compagner <[email protected]> Committed: Tue Sep 4 09:01:03 2012 +0200 ---------------------------------------------------------------------- .../html/autocomplete/wicket-autocomplete.js | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/aec2c742/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js ---------------------------------------------------------------------- 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 d8e660d..8b430e3 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 @@ -99,12 +99,14 @@ Wicket.AutoComplete=function(elementId, callbackUrl, cfg, indicatorId){ // WICKET-1280 objonchangeoriginal=obj.onchange; obj.onchange=function(event){ + event = Wicket.fixEvent(event); if(mouseactive==1)return false; if(typeof objonchangeoriginal=="function") return objonchangeoriginal.apply(this,[event]); } objonchange=obj.onchange; Wicket.Event.add(obj,'blur',function(event){ + event = Wicket.fixEvent(event); if(mouseactive==1){ ignoreOneFocusGain = true; Wicket.$(elementId).focus(); @@ -133,6 +135,7 @@ Wicket.AutoComplete=function(elementId, callbackUrl, cfg, indicatorId){ } obj.onkeydown=function(event){ + event = Wicket.fixEvent(event); switch(wicketKeyCode(Wicket.fixEvent(event))){ case KEY_UP: if(selected>-1) setSelected(selected-1); @@ -185,6 +188,7 @@ Wicket.AutoComplete=function(elementId, callbackUrl, cfg, indicatorId){ } obj.onkeyup=function(event){ + event = Wicket.fixEvent(event); switch(wicketKeyCode(Wicket.fixEvent(event))){ case KEY_TAB: case KEY_ENTER: @@ -205,6 +209,7 @@ Wicket.AutoComplete=function(elementId, callbackUrl, cfg, indicatorId){ } obj.onkeypress=function(event){ + event = Wicket.fixEvent(event); if(wicketKeyCode(Wicket.fixEvent(event))==KEY_ENTER){ if(selected>-1 || hidingAutocomplete==1){ hidingAutocomplete=0; @@ -612,6 +617,7 @@ Wicket.AutoComplete=function(elementId, callbackUrl, cfg, indicatorId){ elementCount=selectableElements.length; var clickFunc = function(event) { + event = Wicket.fixEvent(event); mouseactive = 0; var value = getSelectedValue(); var input = wicketGet(elementId); @@ -627,6 +633,7 @@ Wicket.AutoComplete=function(elementId, callbackUrl, cfg, indicatorId){ }; var mouseOverFunc = function(event) { + event = Wicket.fixEvent(event); setSelected(getElementIndex(this)); render(false, false); // don't scroll - breaks mouse wheel scrolling showAutoComplete();
