From 10e890e41ff4d1724e0428ae1e46b0cabdd081c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 13 Dec 2021 16:24:17 -0500 Subject: [PATCH] fix: targetBlank/dropdown not getting cleared show caret if nav item is dropdown --- public/src/admin/settings/navigation.js | 8 +++++++- src/navigation/admin.js | 1 + src/views/admin/settings/navigation.tpl | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/src/admin/settings/navigation.js b/public/src/admin/settings/navigation.js index ae9e406645..81adc6fe60 100644 --- a/public/src/admin/settings/navigation.js +++ b/public/src/admin/settings/navigation.js @@ -32,12 +32,18 @@ define('admin/settings/navigation', [ iconSelect.init(iconEl, function (el) { const newIconClass = el.attr('value'); const index = iconEl.parents('[data-index]').attr('data-index'); - $('#active-navigation [data-index="' + index + '"] i').attr('class', 'fa fa-fw ' + newIconClass); + $('#active-navigation [data-index="' + index + '"] i.nav-icon').attr('class', 'fa fa-fw ' + newIconClass); iconEl.siblings('[name="iconClass"]').val(newIconClass); iconEl.siblings('.change-icon-link').toggleClass('hidden', !!newIconClass); }); }); + $('#enabled').on('click', '[name="dropdown"]', function () { + const el = $(this); + const index = el.parents('[data-index]').attr('data-index'); + $('#active-navigation [data-index="' + index + '"] i.dropdown-icon').toggleClass('hidden', !el.is(':checked')); + }) + $('#active-navigation').on('click', 'li', onSelect); $('#enabled') diff --git a/src/navigation/admin.js b/src/navigation/admin.js index ce53dbdba5..4f79b7daa9 100644 --- a/src/navigation/admin.js +++ b/src/navigation/admin.js @@ -26,6 +26,7 @@ admin.save = async function (data) { cache = null; pubsub.publish('admin:navigation:save'); + await db.deleteAll(data.map(item => `navigation:enabled:${item.order}`)); await db.setObjectBulk(bulkSet); await db.delete('navigation:enabled'); await db.sortedSetAdd('navigation:enabled', order, order); diff --git a/src/views/admin/settings/navigation.tpl b/src/views/admin/settings/navigation.tpl index d82af8d1ec..6f609d8dee 100644 --- a/src/views/admin/settings/navigation.tpl +++ b/src/views/admin/settings/navigation.tpl @@ -3,9 +3,9 @@