Support title on select and input, for #2221

orbeon · Nov 5, 2015 · 1230ae9 · 1230ae9
1 parent 1b4ae47
commit 1230ae9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/org/orbeon/oxf/xforms/XFormsConstants.java b/src/main/java/org/orbeon/oxf/xforms/XFormsConstants.java
@@ -212,6 +212,7 @@ public enum DeploymentType { separate, integrated, standalone}
     public static final QName XFORMS_FILENAME_QNAME = new QName("filename", XFORMS_NAMESPACE);
     public static final QName XFORMS_MEDIATYPE_QNAME = new QName("mediatype", XFORMS_NAMESPACE);
     public static final QName XXFORMS_SIZE_QNAME = new QName("size", XXFORMS_NAMESPACE);
+    public static final QName XXFORMS_TITLE_QNAME = new QName("title", XXFORMS_NAMESPACE);
     public static final QName XXFORMS_MAXLENGTH_QNAME = new QName("maxlength", XXFORMS_NAMESPACE);
     public static final QName XXFORMS_AUTOCOMPLETE_QNAME = new QName("autocomplete", XXFORMS_NAMESPACE);
     public static final QName XXFORMS_COLS_QNAME = new QName("cols", XXFORMS_NAMESPACE);

diff --git a/src/main/java/org/orbeon/oxf/xforms/processor/handlers/xhtml/XFormsSelect1Handler.java b/src/main/java/org/orbeon/oxf/xforms/processor/handlers/xhtml/XFormsSelect1Handler.java
@@ -142,6 +142,9 @@ public void outputContent(
 
             // Handle accessibility attributes
             handleAccessibilityAttributes(attributes, containerAttributes);
+            if (xformsControl != null)
+                xformsControl.addExtensionAttributesExceptClassAndAcceptForHandler
+                        (containerAttributes, XFormsConstants.XXFORMS_NAMESPACE_URI);
 
             if (isHTMLDisabled(xformsControl))
                 outputDisabledAttribute(containerAttributes);

diff --git a/src/main/scala/org/orbeon/oxf/xforms/analysis/ControlAnalysisFactory.scala b/src/main/scala/org/orbeon/oxf/xforms/analysis/ControlAnalysisFactory.scala
@@ -68,7 +68,8 @@ object ControlAnalysisFactory {
     scope              : Scope
   ) extends InputValueControl(staticStateContext, element, parent, preceding, scope)
      with SelectionControlTrait {
-    override protected val allowedExtensionAttributes = ! isMultiple && isFull set XXFORMS_GROUP_QNAME
+    override protected val allowedExtensionAttributes = (! isMultiple && isFull set XXFORMS_GROUP_QNAME) ++
+                                                        Set(XXFORMS_TITLE_QNAME)
   }
 
   class TriggerControl(
@@ -97,7 +98,7 @@ object ControlAnalysisFactory {
     override protected def externalEventsDef = super.externalEventsDef ++ UploadExternalEvents
     override val externalEvents = externalEventsDef
 
-    override protected val allowedExtensionAttributes = Set(ACCEPT_QNAME, MEDIATYPE_QNAME)
+    override protected val allowedExtensionAttributes = Set(ACCEPT_QNAME, MEDIATYPE_QNAME, XXFORMS_TITLE_QNAME)
   }
 
   class InputControl(
@@ -107,7 +108,7 @@ object ControlAnalysisFactory {
     preceding          : Option[ElementAnalysis],
     scope              : Scope
   ) extends InputValueControl(staticStateContext, element, parent, preceding, scope) {
-    override protected val allowedExtensionAttributes = Set(XXFORMS_SIZE_QNAME, XXFORMS_MAXLENGTH_QNAME, XXFORMS_AUTOCOMPLETE_QNAME)
+    override protected val allowedExtensionAttributes = Set(XXFORMS_SIZE_QNAME, XXFORMS_TITLE_QNAME, XXFORMS_MAXLENGTH_QNAME, XXFORMS_AUTOCOMPLETE_QNAME)
   }
 
   class SecretControl(
@@ -294,4 +295,4 @@ object ControlAnalysisFactory {
   }
 
   def isVariable(qName: QName) = variableFactory.contains(qName)
-}
+}