LTI-282: fix popover error (#259)

* fix popover error * Update Gemfile.lock * Update Gemfile.lock --------- Co-authored-by: Mariam05 <[email protected]>
bigbluebutton · Jun 25, 2024 · 147f2a1 · 147f2a1
1 parent 8c52f52
commit 147f2a1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -96,8 +96,8 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.16.0)
@@ -139,7 +139,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     domain_name (0.6.20240107)
-    doorkeeper (5.7.0)
+    doorkeeper (5.7.1)
       railties (>= 5)
     dotenv (3.1.2)
     dotenv-rails (3.1.2)
@@ -173,7 +173,6 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     ffi (1.17.0)
-    ffi (1.17.0-x86_64-linux-gnu)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -236,10 +235,12 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.24.0)
     minitest-stub_any_instance (1.0.3)
+    mize (0.4.1)
+      protocol (~> 2.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     mutex_m (0.2.0)
-    net-imap (0.4.13)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -266,9 +267,11 @@ GEM
       racc
     pg (1.5.6)
     popper_js (2.11.8)
+    protocol (2.0.0)
+      ruby_parser (~> 3.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.1.1)
+    public_suffix (6.0.0)
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.8.0)
@@ -323,7 +326,7 @@ GEM
     repost (0.3.8)
     request_store (1.7.0)
       rack (>= 1.4)
-    rexml (3.3.0)
+    rexml (3.3.1)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -366,6 +369,9 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    ruby_parser (3.21.0)
+      racc (~> 1.5)
+      sexp_processor (~> 4.16)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -376,6 +382,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
+    sexp_processor (4.17.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -397,7 +404,8 @@ GEM
     strscan (3.1.0)
     sync (0.5.0)
     syslog_protocol (0.9.2)
-    term-ansicolor (1.9.0)
+    term-ansicolor (1.10.2)
+      mize
       tins (~> 1.0)
     terser (1.1.20)
       execjs (>= 0.3.0, < 3)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -39,9 +39,10 @@
 
 // initialize all bootstrap popovers on a page
 $(document).ready(function(){
-	$('[data-bs-toggle="popover"]').popover({
-		trigger: 'focus'
-	});
+	var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'))
+	popoverTriggerList.map(function (popoverTriggerEl) {
+		return new bootstrap.Popover(popoverTriggerEl)
+	})
 
 	 // Prevent form submission when clicking on the popover trigger (info icon)
 	 $('.info-icon').click(function(event){

diff --git a/app/views/message/deep_link.html.erb b/app/views/message/deep_link.html.erb
@@ -33,8 +33,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. %>
 								tabindex="0" 
 								role="button"
 								data-bs-toggle="popover"
+								data-bs-placement="top"
 								title="<%= app[:app_name].capitalize %>" 
-								data-content="<%= t("apps.#{app[:app_name]}.description", default: t("apps.notfound.description")) %>">
+								data-bs-content="<%= t("apps.#{app[:app_name]}.description", default: t("apps.notfound.description")) %>">
 									<i class="fas fa-info-circle"></i>
 							</a>
 						</div>