From 8e18fe2e0b5547280b83761eaa0845b98ec98948 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Mon, 23 Mar 2009 03:42:03 +0000
Subject: [PATCH] added documentation and supported checkUrl computation with
 @field inheritance

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16464 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../resources/lib/form/editableComboBox.jelly | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/core/src/main/resources/lib/form/editableComboBox.jelly b/core/src/main/resources/lib/form/editableComboBox.jelly
index 0eb60c34fb..89e33d64d1 100644
--- a/core/src/main/resources/lib/form/editableComboBox.jelly
+++ b/core/src/main/resources/lib/form/editableComboBox.jelly
@@ -22,28 +22,30 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!--
-	Attributes:
-
-	If @field is specified:
-	   in this case, name and value are inferred from field,
-	   and checkUrl is auto-generated if the check method is present.
-	Otherwise
-	   @name and @value are mandatory.
-
-	<%@attribute name="id" required="true" %>
-	<%@attribute name="clazz" required="false" %>
-	<%@attribute name="items" type="java.lang.Object" description="Optional list of possible values" %>
--->
 <!-- Tomcat doesn't like us using the attribute called 'class' -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <st:documentation>
+    Editable drop-down combo box.
+
+    <st:attribute name="id" use="required" />
+    <st:attribute name="clazz">
+      Additional CSS classes that the control gets.
+    </st:attribute>
+    <st:attribute name="items">
+      List of possible values. Either this or nested &lt;f:editableComboBoxValue/>s are required.
+    </st:attribute>
+    <st:attribute name="field">
+      Used for databinding.
+    </st:attribute>
+  </st:documentation>
+
 	<j:if test="${editableComboBox_source_loaded==null}">
 	  <script type="text/javascript" src="${request.contextPath}/scripts/utilities.js"/>
     <script type="text/javascript" src="${request.contextPath}/scripts/combobox.js"/>
 	  <j:set target="${requestScope}" property="editableComboBox_source_loaded" value="true" />
 	</j:if>
 
-  <j:set var="checkUrl" value="${h.getCheckUrl(attrs.checkUrl,descriptor,attrs.field)}" />
+  <f:prepareDatabinding/>
 
   <input id="${attrs.id}" autocomplete="off" class="${attrs.clazz} ${h.ifThenElse(checkUrl!=null,'validated','')}"
          name ="${h.defaulted(attrs.name,'_.'+attrs.field)}"
-- 
GitLab