Author: ivaynberg
Date: Sat Sep 27 00:52:07 2008
New Revision: 699594
URL: http://svn.apache.org/viewvc?rev=699594&view=rev
Log:
forgotten checkin
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?rev=699594&r1=699593&r2=699594&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
Sat Sep 27 00:52:07 2008
@@ -23,6 +23,7 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
+import org.apache.wicket.util.string.Strings;
/**
* @since 1.2
@@ -55,6 +56,8 @@
protected final String constructInitJS()
{
+ final String indicatorId = findIndicatorId();
+
StringBuffer sb = new StringBuffer();
sb.append("new Wicket.AutoComplete('")
.append(getComponent().getMarkupId())
@@ -62,21 +65,30 @@
.append(getCallbackUrl())
.append("',")
.append(constructSettingsJS())
- .append(");");
+ .append(",");
+ if (Strings.isEmpty(indicatorId))
+ {
+ sb.append("null");
+ }
+ else
+ {
+ sb.append("'").append(findIndicatorId()).append("'");
+ }
+ sb.append(");");
return sb.toString();
}
protected final String constructSettingsJS()
{
final StringBuffer sb = new StringBuffer();
- sb.append("{preselect: ").append(settings.getPreselect());
- sb.append(",maxHeight: ").append(settings.getMaxHeightInPx());
- sb.append(",adjustInputWidth: ").append(settings.isAdjustInputWidth());
- sb.append(",showListOnEmptyInput:
").append(settings.getShowListOnEmptyInput());
- sb.append(",showListOnFocusGain:
").append(settings.getShowListOnFocusGain());
- if(settings.getCssClassName() != null)
- sb.append(",className:
'").append(settings.getCssClassName()).append('\'');
- sb.append('}');
+ sb.append("{preselect: ").append(settings.getPreselect());
+ sb.append(",maxHeight: ").append(settings.getMaxHeightInPx());
+ sb.append(",adjustInputWidth:
").append(settings.isAdjustInputWidth());
+ sb.append(",showListOnEmptyInput:
").append(settings.getShowListOnEmptyInput());
+ sb.append(",showListOnFocusGain:
").append(settings.getShowListOnFocusGain());
+ if (settings.getCssClassName() != null)
+ sb.append(",className:
'").append(settings.getCssClassName()).append('\'');
+ sb.append('}');
return sb.toString();
}
