From e938625faac3d0f8c690344014655e7274b0a07a Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Fri, 23 Nov 2007 10:38:39 +0000 Subject: [PATCH] Filterselect says "0-0/0" instead of "1-0/0" when empty. svn changeset:2908/svn branch:trunk --- .../terminal/gwt/client/ui/IFilterSelect.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java index 2f458123ca..e208e91846 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java @@ -128,8 +128,8 @@ public class IFilterSelect extends Composite implements Paintable, setPopupPosition(x, y); int first = currentPage * PAGELENTH + 1; int last = first + currentSuggestions.size() - 1; - DOM.setInnerText(status, first + "-" + last + "/" - + totalSuggestions); + DOM.setInnerText(status, (totalSuggestions == 0 ? 0 : first) + "-" + + last + "/" + totalSuggestions); setPrevButtonActive(first > 1); setNextButtonActive(last < totalSuggestions); @@ -659,25 +659,25 @@ public class IFilterSelect extends Composite implements Paintable, * Calculate minumum width for FilterSelect textarea */ private native int minWidth(String captions) /*-{ - if(!captions || captions.length <= 0) - return 0; - captions = captions.split("|"); - var d = $wnd.document.createElement("div"); - var html = ""; - for(var i=0; i < captions.length; i++) { - html += "
" + captions[i] + "
"; - // TODO apply same CSS classname as in suggestionmenu - } - d.style.position = "absolute"; - d.style.top = "0"; - d.style.left = "0"; - d.style.visibility = "hidden"; - d.innerHTML = html; - $wnd.document.body.appendChild(d); - var w = d.offsetWidth; - $wnd.document.body.removeChild(d); - return w; - }-*/; + if(!captions || captions.length <= 0) + return 0; + captions = captions.split("|"); + var d = $wnd.document.createElement("div"); + var html = ""; + for(var i=0; i < captions.length; i++) { + html += "
" + captions[i] + "
"; + // TODO apply same CSS classname as in suggestionmenu + } + d.style.position = "absolute"; + d.style.top = "0"; + d.style.left = "0"; + d.style.visibility = "hidden"; + d.innerHTML = html; + $wnd.document.body.appendChild(d); + var w = d.offsetWidth; + $wnd.document.body.removeChild(d); + return w; + }-*/; public void onFocus(Widget sender) { // NOP -- 2.39.5