final few tweaks to get subject classifier to behave correctly

DOAJ · Jan 30, 2025 · d5ac6d2 · d5ac6d2
1 parent 4f75ccb
commit d5ac6d2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/portality/static/js/doaj.fieldrender.edges.js b/portality/static/js/doaj.fieldrender.edges.js
@@ -733,8 +733,10 @@ $.extend(true, doaj, {
                 var checkboxSelector = edges.css_class_selector(namespace, "selector", this);
                 edges.on(checkboxSelector, "change", this, "filterToggle");
 
-                var toggleSelector = edges.css_id_selector(namespace, "toggle", this);
-                edges.on(toggleSelector, "click", this, "toggleOpen");
+                if (this.togglable) {
+                    var toggleSelector = edges.css_id_selector(namespace, "toggle", this);
+                    edges.on(toggleSelector, "click", this, "toggleOpen");
+                }
 
                 var searchSelector = edges.css_id_selector(namespace, "search", this);
                 edges.on(searchSelector, "keyup", this, "filterSubjects");
@@ -891,6 +893,11 @@ $.extend(true, doaj, {
             }
 
             this._findRenderedElement = function(st, value) {
+                let label = this.component.jq("label[for='" + value + "']");
+                if (label.length > 0) {
+                    return label[0];
+                }
+
                 // Step 1: Find HTML element with id=lastClickedEl
                 const element = document.getElementById(value);
 
@@ -916,7 +923,11 @@ $.extend(true, doaj, {
                 var st = this.component.syncTree;
                 var elemToScroll = this._findRenderedElement(st, this.lastClickedEl);
                 if (elemToScroll) {
-                    browser.scrollTop = elemToScroll.offsetTop - browser.offsetTop - this.viewWindowScrollOffset;
+                    elemToScroll.scrollIntoView();
+                    if (browser.clientHeight > 0) {
+                        browser.scrollBy(0, -1 * browser.clientHeight / 2);
+                    }
+                    // browser.scrollTop = elemToScroll.offsetTop - browser.offsetTop - this.viewWindowScrollOffset;
                 }
             }
 

diff --git a/portality/static/js/formulaic.js b/portality/static/js/formulaic.js
@@ -867,6 +867,8 @@ var formulaic = {
 
             this.ns = "formulaic-subjecttree";
 
+            this.nestedEdge = false;
+
             this.init = function () {
 
                 var tree = doaj.af.lccTree;
@@ -935,11 +937,12 @@ var formulaic = {
                     renderer: doaj.renderers.newSubjectBrowserRenderer({
                         title: "Subjects",
                         open: true,
-                        showCounts: false
+                        showCounts: false,
+                        togglable: false
                     })
                 });
 
-                var e = edges.newEdge({
+                this.nestedEdge = edges.newEdge({
                     selector: containerSelector,
                     manageUrl: false,
                     components: [