Merge branch '6.0/migrate-js-escape'

bestpractical · Dec 30, 2024 · b6bb8e8 · b6bb8e8
2 parents 27442d0 + a5d533c
commit b6bb8e8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/share/static/js/util.js b/share/static/js/util.js
@@ -818,7 +818,7 @@ jQuery(function() {
         if ( evt.detail.value ) {
             for ( const action of evt.detail.value ) {
                 // Need to decode action that is UTF-8 encoded
-                jQuery.jGrowl(decodeURIComponent(escape(action)), { themeState: 'none' });
+                jQuery.jGrowl(decodeURIComponent(encodeURIComponent(action)), { themeState: 'none' });
             }
 
             const history_container = document.querySelector('.history-container');
@@ -854,7 +854,7 @@ jQuery(function() {
     });
 
     document.body.addEventListener('titleChanged', function(evt) {
-        document.title = decodeURIComponent(escape(evt.detail.value));
+        document.title = decodeURIComponent(encodeURIComponent(evt.detail.value));
     });
 
     document.body.addEventListener('triggerChanged', function(evt) {
@@ -865,7 +865,7 @@ jQuery(function() {
     document.body.addEventListener('widgetTitleChanged', function(evt) {
         const title = evt.detail.elt.closest('div.titlebox').querySelector('.titlebox-title a');
         if ( title ) {
-            title.innerHTML = decodeURIComponent(escape(evt.detail.value));
+            title.innerHTML = decodeURIComponent(encodeURIComponent(evt.detail.value));
         }
     });