Avoid compilation warnings

Author: avernet

form-builder/js/src/main/scala/org/orbeon/builder/ControlLabelHintTextEditor.scala

@@ -219,7 +219,7 @@ object ControlLabelHintTextEditor {
         }))
         checkboxInput.get(0).foreach(_.addEventListener(DomEventNames.Click, (_: dom.Event) => {
           // When checkbox clicked, set focus back on the text field, where it was before
-          textInput.focus()
+          textInput.trigger("focus")
         }))
       }
 
@@ -326,7 +326,7 @@ object ControlLabelHintTextEditor {
             }
           case EditorType.Label | EditorType.Hint =>
             textInput.value(newValue)
-            textInput.focus()
+            textInput.trigger("focus")
         }
 
       def isHTML: Boolean = getEditorType == EditorType.Text || checkboxInput.is(":checked")

form-builder/js/src/main/scala/org/orbeon/builder/LabelEditor.scala

@@ -133,7 +133,7 @@ object LabelEditor {
         Offset.offset(labelInput, inputOffset)
         Offset.offset(labelInput, inputOffset) // Workaround for issue on Chrome, see https://github.com/orbeon/orbeon-forms/issues/572
         labelInput.width(clickInterceptor.width() - 10)
-        labelInput.focus()
+        labelInput.trigger("focus")
       }
 
     // Update highlight of section title, as a hint users can click to edit

form-runner-web/src/main/scala/org/orbeon/xbl/WPaint.scala

@@ -72,7 +72,7 @@ object WPaint {
           colorOpt.map("#" + _).orUndefined
         }
         wpaintElC.asInstanceOf[Dynamic].wPaint(new js.Object {
-          val drawDown: js.Function = () => wpaintElC.focus()
+          val drawDown: js.Function = () => wpaintElC.trigger("focus")
           val imageBg               = imageEl.attr("src")
           val image                 = if (annotation == "") null else annotation
           val strokeStyle           = startStrokeColor

xforms-web/src/main/scala/org/orbeon/xforms/AjaxClient.scala

@@ -156,7 +156,7 @@ object AjaxClient {
     Session.sessionHasExpired()
 
     // Show dialog in `error-dialog.xml`
-    dom.document.querySelectorOpt(s"#$formId .xforms-login-detected-dialog").foreach { dialogEl: html.Element =>
+    dom.document.querySelectorOpt(s"#$formId .xforms-login-detected-dialog").foreach { (dialogEl: html.Element) =>
 
       def getUniqueId(prefix: String): String = {
         var i = 0

xforms-web/src/main/scala/org/orbeon/xforms/ErrorPanel.scala

@@ -112,7 +112,7 @@ object ErrorPanel {
     formErrorPanel.center()
 
     // Focus within the dialog so that screen readers handle aria attributes
-    jErrorPanelElem.find(".container-close").focus()
+    jErrorPanelElem.find(".container-close").trigger("focus")
   }
 
   private object Private {

xforms-web/src/main/scala/org/orbeon/xforms/Page.scala

@@ -95,13 +95,12 @@ object Page {
         case formElem: html.Form =>
           Some(formElem)
         case elem: html.Element =>
-          elem.asInstanceOf[js.Dynamic].form match {
-            case formElem: html.Form =>
-              // TODO: `fruitless type test: a value of type scala.scalajs.js.Dynamic cannot also be a org.scalajs.dom.HTMLFormElement`
-              //  But is that warning correct? Do we ever take this branch?
-              Some(formElem)
-            case _ =>
-              elem.closestOpt(s"form.$FormClass[id]").map(_.asInstanceOf[html.Form])
+          val elemFormProperty = elem.asInstanceOf[js.Dynamic]
+            .form.asInstanceOf[js.UndefOr[html.Form]]
+            .toOption
+          elemFormProperty match {
+            case Some(_) => elemFormProperty
+            case None    => elem.closestOpt(s"form.$FormClass[id]").map(_.asInstanceOf[html.Form])
           }
       }
 

xforms-web/src/main/scala/org/orbeon/xforms/Placement.scala

@@ -15,11 +15,11 @@ object Placement {
   val RequiredSpaceHorizontal = 420
   val RequiredSpaceVertical   = 300
 
-  case object Top    extends { val entryName = "top"    } with Placement
-  case object Right  extends { val entryName = "right"  } with Placement
-  case object Bottom extends { val entryName = "bottom" } with Placement
-  case object Left   extends { val entryName = "left"   } with Placement
-  case object Over   extends { val entryName = "over"   } with Placement
+  case object Top    extends Placement { val entryName = "top"    }
+  case object Right  extends Placement { val entryName = "right"  }
+  case object Bottom extends Placement { val entryName = "bottom" }
+  case object Left   extends Placement { val entryName = "left"   }
+  case object Over   extends Placement { val entryName = "over"   }
 
   case class Margins(
     top    : Double,