From 60e6ac3b6e8597a5cc63c9f60c943fa122b70698 Mon Sep 17 00:00:00 2001
From: fnuesse <felix.nuesse@t-online.de>
Date: Mon, 18 Jun 2018 12:35:20 +0200
Subject: Fixed css-flashing

Signed-off-by: fnuesse <felix.nuesse@t-online.de>

Fixed menu if initially empty

Signed-off-by: fnuesse <felix.nuesse@t-online.de>
---
 apps/files/js/navigation.js | 18 ++++++++++++++----
 apps/files/js/tagsplugin.js | 10 ++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'apps/files/js')

diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js
index 04c9143581c..f7757751b8f 100644
--- a/apps/files/js/navigation.js
+++ b/apps/files/js/navigation.js
@@ -146,11 +146,17 @@
 			var qaSelector= '#quickaccess-list';
 
 			if(itemId==='button-collapseQuickAccess'){
+
+				document.getElementById('enableQuickAccess').checked=!document.getElementById('enableQuickAccess').checked;
 				$.get(OC.generateUrl("/apps/files/api/v1/showquickaccess"),  {show: document.getElementById('enableQuickAccess').checked}, function(data, status){
 				});
-				$("#quickaccess-list" ).toggle('open');
-				var dotmenu = document.getElementById("quickaccess-list");
-				dotmenu.style.display='';
+
+				if(!$("#favorites-toggle" ).hasClass('open')){
+					$("#favorites-toggle" ).addClass('open');
+				}else{
+					$("#favorites-toggle" ).removeClass('open');
+				}
+
 			}
 
 			if(itemId==='button-favorites'){
@@ -173,7 +179,11 @@
 			if(itemId==='enableQuickAccess' ){
 				$.get(OC.generateUrl("/apps/files/api/v1/showquickaccess"),  {show: document.getElementById('enableQuickAccess').checked}, function(data, status){
 				});
-				$(qaSelector).toggle('open');
+				if(!$("#favorites-toggle" ).hasClass('open')){
+					$("#favorites-toggle" ).addClass('open');
+				}else{
+					$("#favorites-toggle" ).removeClass('open');
+				}
 				document.getElementById('menu-favorites').classList.toggle('open');
 			}
 
diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js
index 8cdc26ab3bb..ce35f8bcdfd 100644
--- a/apps/files/js/tagsplugin.js
+++ b/apps/files/js/tagsplugin.js
@@ -83,6 +83,11 @@
 		if(listUL.childElementCount==0){
 			var dotmenu = document.getElementById("quickaccessbutton");
 			dotmenu.style.display='none';
+
+			var collapsibleButton = document.getElementById("button-collapseQuickAccess");
+			collapsibleButton.style.display='none';
+
+			$("#favorites-toggle" ).removeClass('collapsible');
 		}
 	}
 
@@ -115,6 +120,11 @@
 			listUL.appendChild(li);
 			var dotmenu = document.getElementById("quickaccessbutton");
 			dotmenu.style.display='';
+
+			var collapsibleButton = document.getElementById("button-collapseQuickAccess");
+			collapsibleButton.style.display='';
+
+			$("#favorites-toggle" ).addClass('collapsible');
 		}else{
 			list[list.length-1].after(li);
 		}
-- 
cgit v1.2.3