Merge pull request #673 from alpheios-project/i331-la-lat-update-lang

Several fixes before release
alpheios-project · Dec 1, 2021 · ce9d498 · ce9d498
2 parents abf95c6 + 9c50dc7
commit ce9d498
Show file tree

Hide file tree

Showing 12 changed files with 22,577 additions and 22,671 deletions.
diff --git a/packages/components/dist/alpheios-components.js b/packages/components/dist/alpheios-components.js
diff --git a/packages/components/dist/alpheios-components.js.map b/packages/components/dist/alpheios-components.js.map
diff --git a/packages/components/dist/alpheios-components.min.js b/packages/components/dist/alpheios-components.min.js
diff --git a/packages/components/dist/style/style-components-safari.css b/packages/components/dist/style/style-components-safari.css
diff --git a/packages/components/dist/style/style-components-safari.css.map b/packages/components/dist/style/style-components-safari.css.map
diff --git a/packages/components/dist/style/style-components-safari.min.css b/packages/components/dist/style/style-components-safari.min.css
diff --git a/packages/components/dist/style/style-components.css b/packages/components/dist/style/style-components.css
diff --git a/packages/components/dist/style/style-components.css.map b/packages/components/dist/style/style-components.css.map
diff --git a/packages/components/dist/style/style-components.min.css b/packages/components/dist/style/style-components.min.css
diff --git a/packages/components/src/lib/queries/lexical-query.js b/packages/components/src/lib/queries/lexical-query.js
@@ -215,11 +215,12 @@ export default class LexicalQuery extends Query {
 
     // if lexicon options are set for short definitions, we want to override any
     // short definitions provided by the maAdapter
-    if (lexiconShortOpts.allow && lexiconShortOpts.allow.length > 0) {
-      if (!lexiconShortOpts.allow.includes('empty')) {
-        this.homonym.lexemes.forEach((l) => { l.meaning.clearShortDefs() })
-      }
 
+    if (lexiconShortOpts.allow && ((lexiconShortOpts.allow.length === 0) || !lexiconShortOpts.allow.includes('empty'))) {
+      this.homonym.lexemes.forEach((l) => { l.meaning.clearShortDefs() })
+    }
+
+    if (lexiconShortOpts.allow && lexiconShortOpts.allow.length > 0) {
       if (this._source !== LexicalQuery.sources.WORDLIST) {
         LexicalQuery.evt.HOMONYM_READY.pub(this.homonym)
       } else {

diff --git a/packages/components/src/lib/selection/media/html-selector.js b/packages/components/src/lib/selection/media/html-selector.js
@@ -517,6 +517,9 @@ export default class HTMLSelector extends MediaSelector {
     if (langId === Constants.LANG_UNDEFINED) {
       langId = LanguageModelFactory.getLanguageIdFromCode(this.defaultLanguageCode)
       finalLangCode = this.defaultLanguageCode
+    } else {
+      const langModel = LanguageModelFactory.getLanguageModel(langId)
+      finalLangCode = langModel.languageCode
     }
 
     this.languageID = langId

diff --git a/packages/components/src/vue/components/tooltip.vue b/packages/components/src/vue/components/tooltip.vue
@@ -83,7 +83,7 @@ export default {
       color: var(--alpheios-text-color);
       border: 1px solid var(--alpheios-border-color);
       border-radius: uisize(10px);
-      z-index: 1;
+      z-index: 10;
       opacity: 0;
       transition: opacity .6s;
       display: none;