Merge pull request #13388 from nextcloud/backport/13308/stable29

nextcloud · Sep 25, 2024 · d33d3e9 · d33d3e9
2 parents 62eb6cb + eac9f6d
commit d33d3e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main.js b/src/main.js
@@ -118,7 +118,7 @@ const Sidebar = function() {
 const waitForSidebarToBeOpen = function(sidebarElement, resolve) {
 	if ('ontransitionend' in sidebarElement) {
 		const resolveOnceSidebarWidthHasChanged = (event) => {
-			if (event.propertyName !== 'min-width' && event.propertyName !== 'width' && event.propertyName !== 'max-width') {
+			if (!['min-width', 'width', 'max-width', 'margin-right'].includes(event.propertyName)) {
 				return
 			}
 
@@ -156,7 +156,7 @@ Sidebar.prototype.open = function(path) {
 	store.commit('showSidebar')
 	this.state.file = path
 
-	const sidebarElement = document.getElementById('app-sidebar')
+	const sidebarElement = document.getElementById('app-sidebar') ?? document.getElementById('app-sidebar-vue')
 
 	// The Viewer adjusts its width to the sidebar width once the sidebar has
 	// been opened. The sidebar opens with an animation, so a delay is needed