From 444a9bc91fc284c53ff5c2ddf560ef3fd6a3cb90 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 15 Jun 2021 15:42:56 +0200
Subject: [PATCH] add BUILD_MODULE_EXT_AUTOCOMPLETE build property
---
build.properties.d/00_default.properties | 1 +
src/core/js/annotation.js | 4 ++--
src/core/js/ext_autocomplete.js | 3 +++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build.properties.d/00_default.properties b/build.properties.d/00_default.properties
index 2e0dac3c..76ce6c7f 100644
--- a/build.properties.d/00_default.properties
+++ b/build.properties.d/00_default.properties
@@ -50,6 +50,7 @@ BUILD_MODULE_EXT_BOTTOM_LINE=ENABLED
BUILD_MODULE_EXT_BOTTOM_LINE_TABLE_PREVIEW=DISABLED
BUILD_MODULE_EXT_BOTTOM_LINE_TIFF_PREVIEW=DISABLED
BUILD_MODULE_EXT_BOOKMARKS=ENABLED
+BUILD_MODULE_EXT_ANNOTATION=ENABLED
BUILD_MODULE_USER_MANAGEMENT=ENABLED
BUILD_MODULE_USER_MANAGEMENT_CHANGE_OWN_PASSWORD_REALM=CaosDB
diff --git a/src/core/js/annotation.js b/src/core/js/annotation.js
index dd75a811..42b4217c 100644
--- a/src/core/js/annotation.js
+++ b/src/core/js/annotation.js
@@ -434,7 +434,7 @@ this.annotation = new function() {
};
$(document).ready(function() {
- //if ("${BUILD_MODULE_EXT_ANNOTATION}" == "ENABLED") {
+ if ("${BUILD_MODULE_EXT_ANNOTATION}" == "ENABLED") {
caosdb_modules.register(annotation);
- //}
+ }
});
diff --git a/src/core/js/ext_autocomplete.js b/src/core/js/ext_autocomplete.js
index 080fc37f..9a639fb4 100644
--- a/src/core/js/ext_autocomplete.js
+++ b/src/core/js/ext_autocomplete.js
@@ -181,6 +181,9 @@ var ext_autocomplete = new function () {
},
noResultsText: 'No autocompletion suggestions',
bootstrapVersion: "4",
+ /* this should be updated to 5 when
+ bootstrap-autocomplete releases official support for bootstrap 5.
+ Until then: let's hope the best.*/
});
--
GitLab