From fa3baad55abe5ae9ca3f8011a134c4a00fb56c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Mon, 10 Oct 2022 14:32:12 +0200
Subject: [PATCH] MAINT: use other order when checking suitable name
replacements
---
src/core/js/ext_references.js | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/core/js/ext_references.js b/src/core/js/ext_references.js
index fe4d618c..0853d37d 100644
--- a/src/core/js/ext_references.js
+++ b/src/core/js/ext_references.js
@@ -331,26 +331,25 @@ var resolve_references = new function () {
// TODO handle multiple parents
const par = resolve_references.getParents(entity)[0] || {};
+ const name = getEntityName(entity);
var ret = {
"text": id
};
- if (getEntityHeadingAttribute(entity, "path") !==
+ if (par.name === "TestReferenced" && typeof resolve_references.test_resolver === "function") {
+ // this is a test case, initialized by the test suite.
+ ret = resolve_references.test_resolver(entity);
+ } else if (typeof name !== "undefined" && name.length > 0){
+ ret["text"] = name;
+ } else if (getEntityHeadingAttribute(entity, "path") !==
undefined || par.name == "Image") {
// show file name
var pths = getEntityHeadingAttribute(entity, "path")
.split("/");
ret["text"] = pths[pths.length - 1];
- } else if (par.name === "TestReferenced" && typeof resolve_references.test_resolver === "function") {
- // this is a test case, initialized by the test suite.
- ret = resolve_references.test_resolver(entity);
- } else {
- var name = getEntityName(entity);
- if (typeof name !== "undefined" && name.length > 0) {
- ret["text"] = name;
- }
}
+
return ret;
}
--
GitLab