You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/01/27 09:47:32 UTC
svn commit: r1064027 -
/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
Author: mgrigorov
Date: Thu Jan 27 08:47:31 2011
New Revision: 1064027
URL: http://svn.apache.org/viewvc?rev=1064027&view=rev
Log:
Merge from 1.4.x
Author: jcompagner
Date: Wed Jan 26 14:06:26 2011
New Revision: 1063726
URL: http://svn.apache.org/viewvc?rev=1063726&view=rev
Log:
better scrolling (and selection) support for firefox
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js?rev=1064027&r1=1064026&r2=1064027&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js Thu Jan 27 08:47:31 2011
@@ -135,7 +135,7 @@ Wicket.AutoComplete=function(elementId,
if(selected==-1){
hideAutoComplete();
} else {
- render(true);
+ render(true, false);
}
if(Wicket.Browser.isSafari())return killEvent(event);
break;
@@ -146,7 +146,7 @@ Wicket.AutoComplete=function(elementId,
if(visible==0){
updateChoices();
} else {
- render(true);
+ render(true, false);
showAutoComplete();
}
if(Wicket.Browser.isSafari())return killEvent(event);
@@ -361,12 +361,6 @@ Wicket.AutoComplete=function(elementId,
container.style.overflow = "scroll";
scrollbarSize = container.offsetWidth - container.clientWidth - containerBorderWidths[0];
}
- // although border is computed correctly, resizing needs 1 less px on FF for some dubious reason...
- if (Wicket.Browser.isGecko() && containerBorderWidths[0] > 0 && containerBorderWidths[1] > 0) {
- containerBorderWidths[0]--;
- containerBorderWidths[1]--;
- }
-
container.style.overflow = tmp;
}
}
@@ -560,7 +554,7 @@ Wicket.AutoComplete=function(elementId,
var mouseOverFunc = function(event) {
setSelected(getElementIndex(this));
- render(false); // don't scroll - breaks mouse weel scrolling
+ render(false, false); // don't scroll - breaks mouse weel scrolling
showAutoComplete();
};
var parentNode = element.firstChild;
@@ -581,7 +575,7 @@ Wicket.AutoComplete=function(elementId,
} else {
hideAutoComplete();
}
- render(false);
+ render(false, true);
scheduleEmptyCheck();
@@ -641,7 +635,7 @@ Wicket.AutoComplete=function(elementId,
}
}
- function render(adjustScroll){
+ function render(adjustScroll, adjustHeight) {
var menu=getAutocompleteMenu();
var height=0;
var node=menu.firstChild.childNodes[0];
@@ -675,7 +669,11 @@ Wicket.AutoComplete=function(elementId,
menu.parentNode.style.height = (newH >= 0 ? newH : cfg.maxHeight) + "px";
sizeAffected = true;
} else if (menu.parentNode.style.height != "auto") { // if height is limited
- menu.parentNode.style.height = "auto"; // no limiting, let popup determine it's own height
+ // this also changes the scroll, in some cases we don't want that
+ if (adjustHeight)
+ {
+ menu.parentNode.style.height = "auto"; // no limiting, let popup determine it's own height
+ }
sizeAffected = true;
}
}