Merge pull request 'fix #369: The menu is displayed even if there are no apps' (#370) from bugfix/issue369 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/370
This commit is contained in:
+5
-6
@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
<ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
|
<ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
|
||||||
<SideMenuApp
|
<SideMenuApp
|
||||||
v-for="(app, key) in apps"
|
v-for="(app, key) in apps"
|
||||||
v-if="!hiddenApps.includes(app.id) && searchMatch(app.name)"
|
v-if="searchMatch(app.name)"
|
||||||
v-bind:classes="{'side-menu-app': true, 'active': app.active}"
|
v-bind:classes="{'side-menu-app': true, 'active': app.active}"
|
||||||
v-bind:key="key"
|
v-bind:key="key"
|
||||||
v-bind:icon="app.icon"
|
v-bind:icon="app.icon"
|
||||||
@@ -94,17 +94,16 @@ export default {
|
|||||||
orders[app] = order + 1
|
orders[app] = order + 1
|
||||||
})
|
})
|
||||||
|
|
||||||
for (let id in ncApps) {
|
for (let app of ncApps) {
|
||||||
if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
|
if (window.topMenuApps.includes(app.id) && !window.topSideMenuApps.includes(app.id)) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.hiddenApps.includes(id)) {
|
if (this.hiddenApps.includes(app.id)) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
let app = ncApps[id]
|
app.order = orders[app.id] || null
|
||||||
app.order = orders[id] || null
|
|
||||||
|
|
||||||
finalApps.push(app)
|
finalApps.push(app)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user