Merge 7f5ea3c8f8 into 624c024766

Merge branch 'main' into fix/rendering-of-polls-in-history-modal
Fix rendering of poll options in status history modal
2025-09-06 18:01:05 +00:00 · 2025-09-03 10:05:12 +00:00 · 2025-09-01 18:24:09 +02:00 · 2025-08-02 03:07:17 +02:00
1 changed files with 9 additions and 7 deletions
--- a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
@ -86,13 +86,15 @@ class CompareHistoryModal extends PureComponent {
                <ul>
                  {currentVersion.getIn(['poll', 'options']).map(option => (
                    <li key={option.get('title')}>
-                      <span className='poll__input disabled' />
+                      <label className='poll__option editable'>
-
+                        {/* FIXME: does not support multiple choice, #35632 */}
-                      <span
+                        <span className='poll__input' />
-                        className='poll__option__text translate'
+                        <span
-                        dangerouslySetInnerHTML={{ __html: emojify(escapeTextContentForBrowser(option.get('title')), emojiMap) }}
+                          className='poll__option__text translate'
-                        lang={language}
+                          dangerouslySetInnerHTML={{ __html: emojify(escapeTextContentForBrowser(option.get('title')), emojiMap) }}
-                      />
+                          lang={language}
                        />
                      </label>
                    </li>
                  ))}
                </ul>
Author	SHA1	Message	Date
Emelia Smith	289270de03	Merge `7f5ea3c8f8` into `624c024766`	2025-09-03 10:05:12 +00:00
Emelia Smith	7f5ea3c8f8	Merge branch 'main' into fix/rendering-of-polls-in-history-modal	2025-09-01 18:24:09 +02:00
Emelia Smith	2966e1a30d	Fix rendering of poll options in status history modal	2025-08-02 03:07:17 +02:00