Merge branch 'release/26.x'

* release/26.x: #3634 - Dropdowns look odd #3634 - Dropdowns look odd #3640 - Prev/next annotation buttons sometimes hang
inception-project · Dec 17, 2022 · a466f76 · a466f76
2 parents bc44080 + 7303f18
commit a466f76
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/...n/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/util/WebAnnoCasUtil.java b/...n/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/util/WebAnnoCasUtil.java
@@ -367,7 +367,8 @@ public static <T extends AnnotationFS> T getNext(T aRef)
             return null;
         }
 
-        // First match is a hit?
+        // If the first annotation we hit is already the reference annotation, we can simply
+        // move on to the next one and are done.
         if (it.get() == aRef) {
             it.moveToNext();
             return it.isValid() ? (T) it.get() : null;
@@ -389,6 +390,7 @@ public static <T extends AnnotationFS> T getNext(T aRef)
                 it.moveToNext();
                 return it.isValid() ? (T) it.get() : null;
             }
+            it.moveToNext();
         }
 
         return null;
@@ -405,7 +407,8 @@ public static <T extends AnnotationFS> T getPrev(T aRef)
             return null;
         }
 
-        // First match is a hit?
+        // If the first annotation we hit is already the reference annotation, we can simply
+        // move on to the previous one and are done.
         if (it.get() == aRef) {
             it.moveToPrevious();
             return it.isValid() ? (T) it.get() : null;
@@ -427,6 +430,7 @@ public static <T extends AnnotationFS> T getPrev(T aRef)
                 it.moveToPrevious();
                 return it.isValid() ? (T) it.get() : null;
             }
+            it.moveToNext();
         }
 
         return null;

diff --git a/inception/inception-bootstrap/src/main/ts/bootstrap/inception-custom.scss b/inception/inception-bootstrap/src/main/ts/bootstrap/inception-custom.scss
@@ -24,6 +24,7 @@ html, body {
   width: 100%;
   display: flex;
   flex-direction: column;
+  overflow: hidden;
 }
 
 .page-header {

diff --git a/...ion-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoStyleUtils.java b/...ion-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoStyleUtils.java
@@ -35,7 +35,7 @@ public static void autoDropdownWidth(JQueryBehavior aBehavior)
         aBehavior.setOption("open", join(" ", //
                 "function(e) {", //
                 "  var listContainer = e.sender.list.closest('.k-popup');", //
-                "  listContainer.width(Math.max($(window).width()*0.3+kendo.support.scrollbar(),300))", //
+                "  listContainer.width(Math.max(window.innerWidth*0.3+kendo.support.scrollbar(),300))", //
                 "}"));
     }
 
@@ -49,7 +49,8 @@ public static void autoDropdownWidth(JQueryBehavior aBehavior)
     public static void autoDropdownHeight(JQueryBehavior aBehavior)
     {
         //
-        aBehavior.setOption("height", "Math.max($(window).height()*0.5,200)");
+        aBehavior.setOption("height", join(" ", //
+                "Math.max(window.innerHeight*0.5,200)"));
     }
 
     /**

diff --git a/.../main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java b/.../main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java
@@ -40,6 +40,7 @@
 import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState;
 import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupport;
 import de.tudarmstadt.ukp.inception.schema.feature.FeatureSupportRegistry;
+import de.tudarmstadt.ukp.inception.support.kendo.KendoStyleUtils;
 
 public class MultiValueConceptFeatureEditor
     extends ConceptFeatureEditor_ImplBase
@@ -120,10 +121,12 @@ public void onConfigure(JQueryBehavior aBehavior)
 
     private void styleMultiSelect(JQueryBehavior aBehavior)
     {
-        aBehavior.setOption("autoWidth", true);
+        // aBehavior.setOption("autoWidth", true);
+        KendoStyleUtils.autoDropdownWidth(aBehavior);
+        // aBehavior.setOption("height", 300);
+        KendoStyleUtils.autoDropdownHeight(aBehavior);
         aBehavior.setOption("animation", false);
         aBehavior.setOption("delay", 250);
-        aBehavior.setOption("height", 300);
     }
 
     @Override
@@ -186,6 +189,7 @@ public void onConfigure(JQueryBehavior aBehavior)
             // aBehavior.setOption("autoBind", false);
             // aBehavior.setOption("minLength", 1);
             // aBehavior.setOption("enforceMinLength", true);
+
             aBehavior.setOption("tagTemplate",
                     Options.asString(
                             "<span title=\"#: data.description + '\\n\\n' + data.identifier #\" "

diff --git a/...-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.html b/...-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.html
@@ -38,7 +38,7 @@ <h5 class="col-sm-12">
       <wicket:message key="kb.wizard.steps.type.language"/>
     </label>
     <div class="col-sm-9">
-      <input wicket:id="language" class="form-control"/>
+      <input wicket:id="language"/>
     </div>
   </div>
   <div class="row form-row" wicket:enclosure="enabled">
@@ -56,7 +56,7 @@ <h5 class="col-sm-12">
       <wicket:label key="kb.iri.basePrefix"/>
     </label>
     <div class="col-sm-9">
-      <input wicket:id="basePrefix" class="form-control"/>
+      <input wicket:id="basePrefix"/>
     </div>
   </div>
 </wicket:panel>