mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-11-04 02:02:14 +01:00 
			
		
		
		
	ensure twemoji font is loaded when showing SAS emojis
This commit is contained in:
		
							parent
							
								
									6ee09cd688
								
							
						
					
					
						commit
						6723cca48e
					
				@ -20,6 +20,7 @@ import { _t, _td } from '../../../languageHandler';
 | 
				
			|||||||
import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
 | 
					import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
 | 
				
			||||||
import AccessibleButton from "../elements/AccessibleButton";
 | 
					import AccessibleButton from "../elements/AccessibleButton";
 | 
				
			||||||
import DialogButtons from "../elements/DialogButtons";
 | 
					import DialogButtons from "../elements/DialogButtons";
 | 
				
			||||||
 | 
					import { fixupColorFonts } from '../../../utils/FontManager';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function capFirst(s) {
 | 
					function capFirst(s) {
 | 
				
			||||||
    return s.charAt(0).toUpperCase() + s.slice(1);
 | 
					    return s.charAt(0).toUpperCase() + s.slice(1);
 | 
				
			||||||
@ -44,6 +45,13 @@ export default class VerificationShowSas extends React.Component {
 | 
				
			|||||||
        };
 | 
					        };
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    componentWillMount() {
 | 
				
			||||||
 | 
					        // As this component is also used before login (during complete security),
 | 
				
			||||||
 | 
					        // also make sure we have a working emoji font to display the SAS emojis here.
 | 
				
			||||||
 | 
					        // This is also done from LoggedInView.
 | 
				
			||||||
 | 
					        fixupColorFonts();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    onMatchClick = () => {
 | 
					    onMatchClick = () => {
 | 
				
			||||||
        this.setState({ pending: true });
 | 
					        this.setState({ pending: true });
 | 
				
			||||||
        this.props.onDone();
 | 
					        this.props.onDone();
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user