Merge pull request 'add check if menu exists before adding event listeners (#210)' (#211) from feature/issue210 into v2.x

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

.woodpecker.yml

@@ -5,7 +5,7 @@ pipeline:
       - npm install
     when:
       event: [tag, push, pull_request]
-      branch: [master, develop, feature/*]
+      branch: [master, develop, v2.x, feature/*]
 
   build:
     image: deblan/devenv

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## 2.5.2
+### Fixed
+* add check if menu exists before adding event listeners (#210)
+
+## 2.5.1
+### Fixed
+* fix icon render (#133)
+
 ## 2.5.0
 ### Changed
 * upgrade dependencies

appinfo/info.xml

@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>2.5.0</version>
+    <version>2.5.2</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

src/SideMenuApp.vue

@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
     <li v-bind:class="classes">
         <a v-bind:href="href" :target="target" v-bind:title="label">
-            <span class="side-menu-app-icon" v-text="icon"></span>
+            <span class="side-menu-app-icon" v-html="icon"></span>
             <span class="side-menu-app-text" v-text="label"></span>
         </a>
     </li>

templates/js/script.php

@@ -96,6 +96,10 @@ if ($_['always-displayed']) {
         const headerMenuOpener = querySelector('#header .side-menu-opener')
         const sideMenuOpener = querySelectorAll('#side-menu .side-menu-opener')
 
+        if (!headerMenuOpener) {
+            return
+        }
+
         sideMenuFocus = () => {
             let a = querySelector('.side-menu-app.active a', sideMenu)
 
@@ -197,11 +201,13 @@ if ($_['always-displayed']) {
         <?php require_once __DIR__.'/_loaderEnabled.js'; ?>
     <?php endif; ?>
 
-    <?php if ($_['opener-position'] === 'before'): ?>
-        nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
-    <?php else: ?>
-        nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
-    <?php endif; ?>
+    if (nextcloud) {
+        <?php if ($_['opener-position'] === 'before'): ?>
+            nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
+        <?php else: ?>
+            nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
+        <?php endif; ?>
+    }
 
     <?php if (!empty($_['top-menu-apps']) || !empty($_['top-side-menu-apps'])): ?>
         const topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>