Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.
		
			
				
	
	
		
			25 lines
		
	
	
		
			647 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			25 lines
		
	
	
		
			647 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| import loadPolyfills from 'flavours/glitch/util/load_polyfills';
 | |
| import ready from 'flavours/glitch/util/ready';
 | |
| import loadKeyboardExtensions from 'flavours/glitch/util/load_keyboard_extensions';
 | |
| 
 | |
| function main() {
 | |
|   const { delegate } = require('@rails/ujs');
 | |
| 
 | |
|   delegate(document, '.sidebar__toggle__icon', 'click', () => {
 | |
|     const target = document.querySelector('.sidebar ul');
 | |
| 
 | |
|     if (target.style.display === 'block') {
 | |
|       target.style.display = 'none';
 | |
|     } else {
 | |
|       target.style.display = 'block';
 | |
|     }
 | |
|   });
 | |
| }
 | |
| 
 | |
| loadPolyfills()
 | |
|   .then(main)
 | |
|   .then(loadKeyboardExtensions)
 | |
|   .catch(error => {
 | |
|     console.error(error);
 | |
|   });
 |