ATLAS-4012:UI:Atlas - Upgrade bootstrap to 3.4.1 or 4.3.1 fixed
Signed-off-by: Nikhil Bonte <nbonte@apache.org>
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index 001de7d..44a0c4e 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -352,8 +352,8 @@
}
},
"bootstrap": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
"integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
},
"bootstrap-daterangepicker": {
diff --git a/dashboardv2/package.json b/dashboardv2/package.json
index 5e20147..2cc1d4b 100644
--- a/dashboardv2/package.json
+++ b/dashboardv2/package.json
@@ -28,7 +28,7 @@
"backgrid-paginator": "0.3.9",
"backgrid-select-all": "0.3.5",
"backgrid-sizeable-columns": "0.1.1",
- "bootstrap": "3.3.7",
+ "bootstrap": "3.4.1",
"bootstrap-daterangepicker": "3.1.0",
"d3": "5.14.2",
"d3-tip": "^0.7.1",
diff --git a/dashboardv2/public/js/utils/Utils.js b/dashboardv2/public/js/utils/Utils.js
index bd80629..04f6fdc 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -28,7 +28,8 @@
placement: 'auto bottom',
html: true,
animation: false,
- container: 'body'
+ container: 'body',
+ sanitize: false
};
if (options.viewFixedPopover || options.contentClass) {
defaultObj.template = '<div class="popover ' + (options.viewFixedPopover ? 'fixed-popover' : '') + ' fade bottom"><div class="arrow"></div><h3 class="popover-title"></h3><div class="' + (options.contentClass ? options.contentClass : '') + ' popover-content"></div></div>';
diff --git a/dashboardv3/package-lock.json b/dashboardv3/package-lock.json
index f681b6d..5b49299 100644
--- a/dashboardv3/package-lock.json
+++ b/dashboardv3/package-lock.json
@@ -352,8 +352,8 @@
}
},
"bootstrap": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
"integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
},
"bootstrap-daterangepicker": {
diff --git a/dashboardv3/package.json b/dashboardv3/package.json
index 10ff43c..49fd9df 100644
--- a/dashboardv3/package.json
+++ b/dashboardv3/package.json
@@ -28,7 +28,7 @@
"backgrid-paginator": "0.3.9",
"backgrid-select-all": "0.3.5",
"backgrid-sizeable-columns": "0.1.1",
- "bootstrap": "3.3.7",
+ "bootstrap": "3.4.1",
"bootstrap-daterangepicker": "3.1.0",
"d3": "5.14.2",
"d3-tip": "^0.7.1",
diff --git a/dashboardv3/public/js/utils/Utils.js b/dashboardv3/public/js/utils/Utils.js
index eca406b..b46be20 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -28,7 +28,8 @@
placement: 'auto bottom',
html: true,
animation: false,
- container: 'body'
+ container: 'body',
+ sanitize: false
};
if (options.viewFixedPopover || options.contentClass) {
defaultObj.template = '<div class="popover ' + (options.viewFixedPopover ? 'fixed-popover' : '') + ' fade bottom"><div class="arrow"></div><h3 class="popover-title"></h3><div class="' + (options.contentClass ? options.contentClass : '') + ' popover-content"></div></div>';