Skip to content

Commit

Permalink
remove trailing slashes
Browse files Browse the repository at this point in the history
  • Loading branch information
stefan committed May 13, 2024
1 parent 4104878 commit 67d4ae4
Show file tree
Hide file tree
Showing 19 changed files with 231 additions and 233 deletions.
20 changes: 10 additions & 10 deletions core/js/logs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ fpcm.logs = {
init: function () {

fpcm.ui_tabs.render('#tabs-logs', {

reload: true,

onShow: function (_el) {
let _logParams = fpcm.system.parseUrlQuery(_el.target.attributes.href.value);
fpcm.vars.jsvars.currentLog.name = _logParams.log ? _logParams.log : null;
fpcm.vars.jsvars.currentLog.key = _logParams.key ? _logParams.key : null;
fpcm.vars.jsvars.currentLog.system = _logParams.system ? _logParams.system : null;
},

onRenderJsonAfter: function (_el, _result) {

if (!_result.logsize) {
Expand All @@ -36,18 +36,18 @@ fpcm.logs = {
_str += '</div>';
fpcm.dom.appendHtml(_el.target.dataset.bsTarget, _str);
}

});

fpcm.dom.bindClick('#btnCleanLogs', function (_event, _ui) {

fpcm.ui_dialogs.confirm({
focusNo: true,
clickYes: function () {
fpcm.logs.clearLogs(fpcm.vars.jsvars.currentLog);
}
});

});

},
Expand All @@ -68,11 +68,11 @@ fpcm.logs = {

return false;
},

reloadLogs: function() {

let _id = fpcm.ui.prepareId('tabs-logs');

let _dom = document.querySelector(_id + ' a.nav-link.active');
fpcm.dom.fromTag(_id + ' a.nav-link.active').removeClass('active');
(new bootstrap.Tab(_dom)).show();
Expand Down
66 changes: 33 additions & 33 deletions core/js/ui/tabs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (fpcm === undefined) {
fpcm.ui_tabs = {

init: function() {

var _el = fpcm.dom.fromClass('fpcm.ui-tabs-function-autoinit');
if (_el === false || !_el.length) {
return true;
Expand All @@ -36,7 +36,7 @@ fpcm.ui_tabs = {

let _nodes = fpcm.ui_tabs.getNodes(_elemClassId);
if (!_nodes) {
return false;
return false;
}

let _tb = [].slice.call(_nodes);
Expand All @@ -57,7 +57,7 @@ fpcm.ui_tabs = {
if (_ev.target.classList.contains('active') && _ev.target.dataset.tabIndex == _currentTab) {
_ev.target.classList.remove('active');
(new bootstrap.Tab(_ev.target)).show();

}

fpcm.ui_tabs.setActiveTab(_ev.target.dataset.tabIndex);
Expand All @@ -67,13 +67,13 @@ fpcm.ui_tabs = {

fpcm.ui_tabs._updateMainToolbar(_ev.target, _ev.relatedTarget);
if (params.emptyPanel && _ev.relatedTarget) {
if (typeof params.onRenderHtmlBefore === 'function') {

if (typeof params.onEmptyPanelBefore === 'function') {
params.onEmptyPanelBefore(_ev);
}

fpcm.dom.fromId(_ev.relatedTarget.dataset.bsTarget).empty();
}
}

if (typeof params.onShow === 'function') {
params.onShow(_ev);
Expand All @@ -85,16 +85,16 @@ fpcm.ui_tabs = {

var _tabList = _ev.target.dataset.dataviewList
? _ev.target.dataset.dataviewList
: false;
: false;

if (!_ev.target.dataset.ajaxQuiet) {

var _ldr = document.createElement('span');
_ldr.classList.add('spinner-border');
_ldr.classList.add('spinner-border-sm');
_ldr.classList.add('ms-2');
_ldr.classList.add('spinner-border-sm');
_ldr.classList.add('ms-2');
_ev.target.appendChild(_ldr);

}

fpcm.ajax.get(_ev.target.href, {
Expand All @@ -109,22 +109,22 @@ fpcm.ui_tabs = {

if (typeof params.onRenderHtmlBefore === 'function') {
params.onRenderHtmlBefore(_ev, _result);
}
}

let _assignment = _result instanceof Object && _result.html ? _result.html : _result;
fpcm.dom.assignHtml(_ev.target.dataset.bsTarget, _assignment);

if (typeof params.onRenderHtmlAfter === 'function') {
params.onRenderHtmlAfter(_ev, _result);
}
}

return false;
}

if (!_result.dataViewVars) {
return false;
}

if (typeof params.onRenderJsonBefore === 'function') {
params.onRenderJsonBefore(_ev, _result);
}
Expand All @@ -141,7 +141,7 @@ fpcm.ui_tabs = {
{
onRenderAfter: params.initDataViewOnRenderAfter
});

if (typeof params.onRenderJsonAfter === 'function') {
params.onRenderJsonAfter(_ev, _result);
}
Expand Down Expand Up @@ -170,7 +170,7 @@ fpcm.ui_tabs = {

(new bootstrap.Tab(_tb[fpcm.vars.jsvars.activeTab])).show();
},

_updateMainToolbar: function (_active, _prev) {

if (!_active || !_prev) {
Expand All @@ -186,11 +186,11 @@ fpcm.ui_tabs = {
return true;
}

fpcm.ui.mainToolbar.find('.fpcm-ui-maintoolbarbuttons-tab'+ _active.dataset.toolbarButtons).removeClass('fpcm-ui-hidden');
fpcm.ui.mainToolbar.find('.fpcm-ui-maintoolbarbuttons-tab'+ _active.dataset.toolbarButtons).removeClass('fpcm-ui-hidden');
fpcm.ui.mainToolbar.find('.fpcm-ui-maintoolbarbuttons-tab'+ _prev.dataset.toolbarButtons).addClass('fpcm-ui-hidden');

},

getNodes: function(_elemClassId) {

_elemClassId = fpcm.ui.prepareId(_elemClassId);
Expand All @@ -201,22 +201,22 @@ fpcm.ui_tabs = {
console.error('No tab nodes fround for "' + _elemClassId + ' a.nav-link"!');
return false;
}

return _nodes;
},

show: function (_elemClassId, _tabId) {

if (!_elemClassId || !_tabId === undefined) {
console.error('Invalid params data given data given "_elemClassId" or "_tabId" cennot be empty!');
return false;
}

_elemClassId = fpcm.ui.prepareId(_elemClassId);

let _nodes = fpcm.ui_tabs.getNodes(_elemClassId);
if (!_nodes) {
return false;
return false;
}

_nodes = [].slice.call(_nodes);
Expand All @@ -231,23 +231,23 @@ fpcm.ui_tabs = {

(new bootstrap.Tab(_nodes[_tabId])).show();
},

getActiveTab: function () {

let _el = document.getElementById('activeTab');
return _el ? _el.value : 0;

},

setActiveTab: function (_val) {

let _el = document.getElementById('activeTab');
if (!_el) {
return false;
}

_el.value = _val;
return true;
}

}
6 changes: 3 additions & 3 deletions inc/controller/action/articles/article/add.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ public function process()
}

protected function onArticleSaveAfterSuccess(int $id): bool
{
{
$this->redirect('articles/edit', [
'id' => $id,
'added' => $this->permissions->article->approve ? 2 : 1
]);
]);

return true;
}

Expand Down

0 comments on commit 67d4ae4

Please sign in to comment.