Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-12 15:48:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Split fragments by & instead of ,

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-12-20 19:58:27 +01:00
parent 98004844f2
commit 6900928bc8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UI/Component/Tab.js
View File

@ -71,7 +71,7 @@ export class Tab
/* Remove selected tab */ /* Remove selected tab */
const oldActive = this.parentNode.getElementsByClassName('active'); const oldActive = this.parentNode.getElementsByClassName('active');
if (oldActive.length > 0) { if (oldActive.length > 0) {
let fragments = fragmentString.split(','); let fragments = fragmentString.split('&');
const index = fragments.indexOf(oldActive[0].getElementsByTagName('label')[0].getAttribute('for')); const index = fragments.indexOf(oldActive[0].getElementsByTagName('label')[0].getAttribute('for'));
if (index > -1) { if (index > -1) {
@ -79,12 +79,12 @@ export class Tab
} }
// find old active and remove it // find old active and remove it
fragmentString = fragments.join(','); fragmentString = fragments.join('&');
jsOMS.removeClass(oldActive[0], 'active'); jsOMS.removeClass(oldActive[0], 'active');
} }
let fragments = fragmentString.split(','); let fragments = fragmentString.split('&');
const index = fragments.indexOf(this.getElementsByTagName('label')[0].getAttribute('for')); const index = fragments.indexOf(this.getElementsByTagName('label')[0].getAttribute('for'));
if (index > -1) { if (index > -1) {
@ -92,14 +92,14 @@ export class Tab
} }
// find old active and remove it // find old active and remove it
fragmentString = fragments.join(','); fragmentString = fragments.join('&');
jsOMS.addClass(this, 'active'); jsOMS.addClass(this, 'active');
/* Add selected tab */ /* Add selected tab */
window.history.replaceState(null, '', window.history.replaceState(null, '',
UriFactory.build( UriFactory.build(
'{%}#' + (fragmentString === '' ? '' : fragmentString + ',') + this.getElementsByTagName('label')[0].getAttribute('for') '{%}#' + (fragmentString === '' ? '' : fragmentString + '&') + this.getElementsByTagName('label')[0].getAttribute('for')
) )
); );
}); });
@ -122,7 +122,7 @@ export class Tab
activateTabUri(e) activateTabUri(e)
{ {
const fragmentString = window.location.href.includes('#') ? HttpUri.parseUrl(window.location.href).fragment : ''; const fragmentString = window.location.href.includes('#') ? HttpUri.parseUrl(window.location.href).fragment : '';
const fragments = fragmentString.split(','), const fragments = fragmentString.split('&'),
fragLength = fragments.length; fragLength = fragments.length;
if (fragLength > 0 && fragmentString !== '') { if (fragLength > 0 && fragmentString !== '') {