Update bootstrap

ucdavis · Nov 1, 2023 · 45fda98 · 45fda98
1 parent 7e0f42e
commit 45fda98
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/app/shared/sharedApp.js b/app/shared/sharedApp.js
@@ -172,6 +172,10 @@ function config ($httpProvider, $compileProvider, $logProvider, IdleProvider, $l
 	// Configure Idle settings
 	IdleProvider.idle(240 * 60); // 28 minutes: After this amount of time passes without the user performing an action the user is considered idle
 	IdleProvider.timeout(2 * 60); // 2 minute: The amount of time the user has to respond before they have been considered timed out
+
+	// Configure Bootstrap sanitizer for popovers/tooltips
+	var popoverDefaults = $.fn.popover.Constructor.DEFAULTS.whiteList;
+	popoverDefaults['button'] = ['data-event-type', 'data-course-id', 'data-teaching-assignment-id', 'data-section-group-id', 'data-instructor-type-id'];
 }
 
 config.$inject = ['$httpProvider', '$compileProvider', '$logProvider', 'IdleProvider', '$locationProvider'];

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "angular-selectize2": "github:machineboy2045/angular-selectize#v3.0.1",
     "angular-ui-bootstrap": "1.3.3",
     "angular-ui-calendar": "1.0.2",
-    "bootstrap": "3.3.7",
+    "bootstrap": "^3.4",
     "bootstrap-colorpicker": "2.5.3",
     "chart.js": "2.9.4",
     "fullcalendar": "3.10.5",