Skip to content

Commit

Permalink
4.3.6
Browse files Browse the repository at this point in the history 
Fix CG Isotope/Simple Isotope compatibility
  • Loading branch information
@conseilgouz
conseilgouz committed Nov 26, 2023
1 parent cb16717 commit 19e5813
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 51 deletions.
81 changes: 41 additions & 40 deletions media/js/init.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* CG Isotope Component/ Simple Isotope module for Joomla 4.x/5.x
* Version : 4.3.5
* Version : 4.3.6
* Package : CG ISotope/Simple Isotope
* copyright : Copyright (C) 2023 ConseilGouz. All rights reserved.
* license : https://www.gnu.org/licenses/gpl-3.0.html GNU/GPL
Expand Down Expand Up @@ -625,10 +625,10 @@ CGIsotope.prototype.events_list = function(component) {
agroup= document.querySelectorAll(this.me+'.filter-button-group-'+component);
for (var i=0; i< agroup.length;i++) {
agroup[i].addEventListener('choice',(evt, params) => {
$myiso.filter_list(this,evt,'choice')
this.filter_list(this,evt,'choice')
});
agroup[i].addEventListener('removeItem',(evt, params) => {
$myiso.filter_list(this,evt,'remove');
this.filter_list(this,evt,'remove');
});

};
Expand All @@ -655,17 +655,17 @@ CGIsotope.prototype.events_button = function(component) {
agroup= document.querySelectorAll(this.me+'.filter-button-group-'+component+' button');
for (var i=0; i< agroup.length;i++) {
['click', 'touchstart'].forEach(type => {
agroup[i].addEventListener(type,function(evt) {
agroup[i].addEventListener(type,(evt) => {
evt.stopPropagation();
evt.preventDefault();
id = this.parentNode.getAttribute('data');
cgisotope[id].filter_button(this,evt);
id = evt.currentTarget.parentNode.getAttribute('data');
cgisotope[id].filter_button(evt.currentTarget,evt);
// reset other buttons
mygroup= this.parentNode.querySelectorAll('button' );
mygroup= evt.currentTarget.parentNode.querySelectorAll('button' );
for (var g=0; g< mygroup.length;g++) {
cgisotope[id].removeClass(mygroup[g],'is-checked');
}
cgisotope[id].addClass(this,'is-checked');
cgisotope[id].addClass(evt.currentTarget,'is-checked');
});
})
};
Expand All @@ -681,7 +681,7 @@ CGIsotope.prototype.events_multibutton = function(component) {
agroup[i].addEventListener(type,function(evt) {
evt.stopPropagation();
evt.preventDefault();
id = this.parentNode.getAttribute('data');
id = evt.currentTarget.parentNode.getAttribute('data');
cgisotope[id].filter_multi(this,evt);
cgisotope[id].set_buttons_multi(this);
})
Expand Down Expand Up @@ -1064,35 +1064,35 @@ CGIsotope.prototype.filter_button = function(obj,evt) {
}
CGIsotope.prototype.filter_multi = function(obj,evt) {
id = obj.parentNode.getAttribute('data');
$this = cgisotope[id];
$myiso = cgisotope[id];
var sortValue = obj.getAttribute('data-sort-value');
child = obj.getAttribute('data-child'); // child group number
$isclone = false;
if (obj.parentNode.id == "clonedbuttons") { // clone
$parent = obj.getAttribute('data-filter-group');
$buttons = document.querySelectorAll('.iso_button_'+$parent+'_'+sortValue);
for (var i=0; i< $buttons.length;i++) {
$this.toggleClass($buttons[i],'is-checked');
$myiso.toggleClass($buttons[i],'is-checked');
}
$isclone = true;
} else {
$parent = obj.parentNode.getAttribute('data-filter-group');
$this.toggleClass(obj,'is-checked');
$myiso.toggleClass(obj,'is-checked');
}
var isChecked = $this.hasClass(obj,'is-checked');
var isChecked = $myiso.hasClass(obj,'is-checked');
// clone offcanvas button
$needclone = false;
$grdparent = obj.parentNode.parentNode;
if ($this.hasClass($grdparent,"offcanvas-body")) {
if ($myiso.hasClass($grdparent,"offcanvas-body")) {
$needclone = true;
}
if ($needclone) {
if ((isChecked) && (sortValue != "*")) { // clone button
if (evt.srcElement.localName == "img")
lib = evt.srcElement.outerHTML+evt.srcElement.nextSibling.textContent;
else lib = evt.srcElement.innerHTML;
$this.create_clone_button($parent,sortValue,lib,'multi',child);
$this.create_clone_listener(sortValue);
$myiso.create_clone_button($parent,sortValue,lib,'multi',child);
$myiso.create_clone_listener(sortValue);
} else { // remove cloned button
if (sortValue != "*") {
aclone = document.querySelector('#clonedbuttons .iso_button_'+$parent+'_'+sortValue)
Expand All @@ -1101,47 +1101,47 @@ CGIsotope.prototype.filter_multi = function(obj,evt) {
}
}
// end of cloning
if (typeof $this.filters[$parent] === 'undefined' ) {
$this.filters[$parent] = [];
if (typeof $myiso.filters[$parent] === 'undefined' ) {
$myiso.filters[$parent] = [];
}
if (sortValue == '*') {
$this.filters[$parent] = ['*'];
$myiso.filters[$parent] = ['*'];
clones = document.querySelectorAll('#clonedbuttons [data-filter-group="'+$parent+'"]');
for (var i=0; i< clones.length;i++) {
clones[i].remove(); // remove other cloned buttons
}
if (child) {
$this.set_family_all($this.me,child,'button')
$myiso.set_family_all($myiso.me,child,'button')
}
} else {
$this.removeFilter($this.filters, $parent,'*');
$this.removeFilter($this.filters, $parent,'none');
$myiso.removeFilter($myiso.filters, $parent,'*');
$myiso.removeFilter($myiso.filters, $parent,'none');
if ( isChecked ) {
$this.addFilter( $this.filters, $parent,sortValue );
$myiso.addFilter( $myiso.filters, $parent,sortValue );
if (child) {
$this.set_family($this.me,$parent,child,sortValue,'button')
$myiso.set_family($myiso.me,$parent,child,sortValue,'button')
}
} else {
$this.removeFilter( $this.filters, $parent, sortValue );
if ($this.filters[$parent].length == 0) {// no more selection
$this.filters[$parent] = ['*'];
$myiso.removeFilter( $myiso.filters, $parent, sortValue );
if ($myiso.filters[$parent].length == 0) {// no more selection
$myiso.filters[$parent] = ['*'];
if ($isclone) {
aclone = document.querySelector('.filter-button-group-'+$parent+' [data-sort-value="*"]');
$this.addClass(aclone,'is-checked');
$myiso.addClass(aclone,'is-checked');
}
}
if (child) {
if ($this.filters[$parent] == ['*']) {// no more selection
$this.set_family_all($this.me,child,'button')
if ($myiso.filters[$parent] == ['*']) {// no more selection
$myiso.set_family_all($myiso.me,child,'button')
} else { // remove current selection
$this.del_family($this.me,$parent,child,sortValue,'button')
$myiso.del_family($myiso.me,$parent,child,sortValue,'button')
}
}
}
}
$this.update_cookie_filter();
$this.iso.arrange();
$this.updateFilterCounts();
$myiso.update_cookie_filter();
$myiso.iso.arrange();
$myiso.updateFilterCounts();
}
CGIsotope.prototype.set_buttons_multi = function(obj) {
$parent = obj.parentNode.getAttribute('data-filter-group');
Expand Down Expand Up @@ -1239,14 +1239,15 @@ CGIsotope.prototype.create_clone_button = function($parent,$sel,$lib,$type,child
CGIsotope.prototype.create_clone_listener = function($sel) {
onebutton = document.querySelector('#clonedbuttons [data-sort-value="'+$sel+'"] ');
['click', 'touchstart'].forEach(type => {
onebutton.addEventListener(type,function(evt) {
onebutton.addEventListener(type,(evt) => {
evt.stopPropagation();
evt.preventDefault();
if (this.getAttribute('data-clone-type') == "multi") $myiso.filter_multi(this);
if (this.getAttribute('data-clone-type') == "button") $myiso.filter_button(this);
if (this.getAttribute('data-clone-type') == "list_multi") $myiso.filter_list_multi(this,evt,'remove');
if (this.getAttribute('data-clone-type') == "list") $myiso.filter_list(this,evt);
this.remove();
$this = evt.currentTarget;
if ($this.getAttribute('data-clone-type') == "multi") this.filter_multi($this,evt);
if ($this.getAttribute('data-clone-type') == "button") this.filter_button($this,evt);
if ($this.getAttribute('data-clone-type') == "list_multi") this.filter_list_multi($this,evt,'remove');
if ($this.getAttribute('data-clone-type') == "list") this.filter_list($this,evt);
$this.remove();
})
})
}
Expand Down
2 changes: 1 addition & 1 deletion media/js/init.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mod_simple_isotope.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
<authorEmail>pascal.leconte@conseilgouz.com</authorEmail>
<authorUrl>www.conseilgouz.com</authorUrl>
<version>4.3.5</version>
<version>4.3.6</version>
<description>SIMPLEISOTOPEDESC</description>
<namespace path="src">ConseilGouz\Module\SimpleIsotope</namespace>
<scriptfile>script.php</scriptfile>
Expand Down
11 changes: 11 additions & 0 deletions mod_simple_isotope_changelog.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<changelogs>
<changelog>
<element>mod_simple_isotope</element>
<type>Module</type>
<version>4.3.6</version>
<note>
<item>Update : 26/11/2023</item>
</note>
<fix>
<item>Fix CG Isotope/Simple Isotope compatibility</item>
</fix>
</changelog>
<changelog>
<element>mod_simple_isotope</element>
<type>Module</type>
Expand Down
9 changes: 2 additions & 7 deletions tmpl/default_cat_tags.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Simple isotope module - Joomla Module
* Version : 4.3.5
* Version : 4.3.6
* Package : Joomla 4.x/5.x
* copyright : Copyright (C) 2023 ConseilGouz. All rights reserved.
* license : https://www.gnu.org/licenses/gpl-3.0.html GNU/GPL
Expand All @@ -22,13 +22,8 @@
use ConseilGouz\Module\SimpleIsotope\Site\Helper\SimpleIsotopeHelper;
use Joomla\CMS\Session\Session;


$uri = Uri::getInstance();
$user = Factory::getUser();





$displaysortinfo = $params->get('displaysortinfo', 'show');

Expand Down Expand Up @@ -829,7 +824,7 @@ class="iso_tag_img_art" alt="'.$tagimage->image_fulltext_alt.'" title="'.$tagima
} else {
echo '<span class="navbar-toggler-text">'.Text::_('SSISO_LIBFILTER').'</span>';
}
echo '</a><div id="clonedbuttons"></div></div>';
echo '</a><div id="clonedbuttons" data="'.$module->id.'"></div></div>';
echo '<div class="offcanvas offcanvas-'.$offcanvaspos.'" tabindex="-1" id="offcanvas_isotope" aria-labelledby="offcanvas_isotopeLabel" data-bs-scroll="true">';
$liboff = Text::_('SSISO_LIBFILTER');
echo '<div class="offcanvas-header"><h5 class="offcanvas-title" id="offcanvas_isotopeLabel">'.$liboff.'</h5>';
Expand Down
4 changes: 2 additions & 2 deletions tmpl/default_fields.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Simple isotope module - Joomla Module
* Version : 4.3.5
* Version : 4.3.6
* Package : Joomla 4.x/5.x
* copyright : Copyright (C) 2023 ConseilGouz. All rights reserved.
* license : https://www.gnu.org/licenses/gpl-3.0.html GNU/GPL
Expand Down Expand Up @@ -868,7 +868,7 @@ class="iso_tag_img_art" alt="'.$tagimage->image_fulltext_alt.'" title="'.$tagima
} else {
echo '<span class="navbar-toggler-text">'.Text::_('SSISO_LIBFILTER').'</span>';
}
echo '</a><div id="clonedbuttons"></div></div>';
echo '</a><div id="clonedbuttons" data="'.$module->id.'"></div></div>';
echo '<div class="offcanvas offcanvas-'.$offcanvaspos.'" tabindex="-1" id="offcanvas'.$obj->div.'" aria-labelledby="offcanvas'.$obj->div.'Label" data-bs-scroll="true">';
$liboff = Text::_('SSISO_LIBFILTER');
echo '<div class="offcanvas-header"><h5 class="offcanvas-title" id="offcanvas'.$obj->div.'Label">'.$liboff.'</h5>';
Expand Down

0 comments on commit 19e5813

Please sign in to comment.