Merge branch 'f-ext-ref-name' into 'dev'

MAINT: use other order when checking suitable name replacements

See merge request !79

CHANGELOG.md

@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-### Changed
+### Changed (for changes in existing functionality)
+- ext_references: names will be shown instead of file names if they exist
 
 ### Deprecated
 

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;
     }