Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: targetBlank/dropdown not getting cleared

Browse Source 
show caret if nav item is dropdown
This commit is contained in:
Barış Soner Uşaklı
2021-12-13 16:24:17 -05:00
parent 69c96078ea
commit 10e890e41f
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/src/admin/settings/navigation.js
View File

@@ -32,12 +32,18 @@ define('admin/settings/navigation', [
iconSelect.init(iconEl, function (el) { iconSelect.init(iconEl, function (el) {
const newIconClass = el.attr('value'); const newIconClass = el.attr('value');
const index = iconEl.parents('[data-index]').attr('data-index'); 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('[name="iconClass"]').val(newIconClass);
iconEl.siblings('.change-icon-link').toggleClass('hidden', !!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); $('#active-navigation').on('click', 'li', onSelect);
$('#enabled') $('#enabled')

1
src/navigation/admin.js
View File

@@ -26,6 +26,7 @@ admin.save = async function (data) {
cache = null; cache = null;
pubsub.publish('admin:navigation:save'); pubsub.publish('admin:navigation:save');
await db.deleteAll(data.map(item => `navigation:enabled:${item.order}`));
await db.setObjectBulk(bulkSet); await db.setObjectBulk(bulkSet);
await db.delete('navigation:enabled'); await db.delete('navigation:enabled');
await db.sortedSetAdd('navigation:enabled', order, order); await db.sortedSetAdd('navigation:enabled', order, order);

4
src/views/admin/settings/navigation.tpl
View File

@@ -3,9 +3,9 @@
<div class="clearfix"> <div class="clearfix">
<ul id="active-navigation" class="nav navbar-nav"> <ul id="active-navigation" class="nav navbar-nav">
<!-- BEGIN navigation --> <!-- BEGIN navigation -->
<li data-index="{navigation.index}" class="{navigation.class} <!-- IF navigation.selected --> active <!-- ENDIF navigation.selected -->"> <li data-index="{navigation.index}" class="{navigation.class} {{{ if navigation.selected }}} active {{{ end }}}">
<a href="#" title="{navigation.route}" id="{navigation.id}"> <a href="#" title="{navigation.route}" id="{navigation.id}">
<i class="fa fa-fw <!-- IF navigation.iconClass -->{navigation.iconClass}<!-- ENDIF navigation.iconClass -->"></i> <i class="nav-icon fa fa-fw {{{ if navigation.iconClass }}}{navigation.iconClass}{{{ end }}}"></i><i class="dropdown-icon fa fa-caret-down{{{ if !navigation.dropdown }}} hidden{{{ end }}}"></i>
</a> </a>
</li> </li>
<!-- END navigation --> <!-- END navigation -->