Merge pull request 'release v3.2.1' (#157) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/157

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## 3.2.1
+### Fixed
+* fix #150: Active app is not visible has active in menu (except in default menu)
+* fix #150: opener position
+
 ## 3.2.0
 ### Added
 * use custom app names using 'app.navigation.name' (#148)

appinfo/info.xml

@@ -32,7 +32,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>3.2.0</version>
+    <version>3.2.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

css/sideMenu.css

@@ -39,6 +39,7 @@
 
 #header .side-menu-opener {
   margin-left: 0px;
+  margin-top: -1px;
 }
 
 .side-menu-settings {

src/SideMenuBig.vue

@@ -60,6 +60,7 @@ import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
 import SideMenuBigApp from './SideMenuBigApp'
+import { loadState } from '@nextcloud/initial-state'
 
 export default {
   name: 'SideMenuBig',
@@ -100,8 +101,13 @@ export default {
     },
 
     retrieveActiveApp() {
-      let activeAppLink = document.querySelector('#appmenu a.active')
-      this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+      const ncApps = loadState('core', 'apps', {})
+
+      for (let id in ncApps) {
+        if (ncApps[id].active) {
+          this.activeApp = id
+        }
+      }
     },
 
     retrieveConfig() {

src/SideMenuWithCategories.vue

@@ -54,17 +54,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
-import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
 import SideMenuBigApp from './SideMenuBigApp'
+import { loadState } from '@nextcloud/initial-state'
 
 export default {
   name: 'SideMenuWithCategories',
   components: {
     SettingsButton,
     OpenerButton,
-    CloserButton,
     Loader,
     SideMenuBigApp,
   },
@@ -98,8 +97,13 @@ export default {
     },
 
     retrieveActiveApp() {
-      let activeAppLink = document.querySelector('#appmenu a.active')
-      this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+      const ncApps = loadState('core', 'apps', {})
+
+      for (let id in ncApps) {
+        if (ncApps[id].active) {
+          this.activeApp = id
+        }
+      }
     },
 
     retrieveConfig() {