From 8a04da4e906cfa1740bd13cf59d7425e96a11abb Mon Sep 17 00:00:00 2001 From: 19leunam93 Date: Wed, 2 Apr 2025 21:39:36 +0200 Subject: [PATCH] cleanup imgjust folder --- media/com_joomgallery/joomla.asset.json | 2 +- media/com_joomgallery/js/imgjust.js | 149 -------- media/com_joomgallery/js/imgjust/LICENSE | 339 ------------------ media/com_joomgallery/js/imgjust/README.md | 9 +- media/com_joomgallery/js/imgjust/imgjust.js | 21 +- .../js/{ => imgjust}/imgjust.min.js | 0 6 files changed, 15 insertions(+), 505 deletions(-) delete mode 100644 media/com_joomgallery/js/imgjust.js delete mode 100644 media/com_joomgallery/js/imgjust/LICENSE rename media/com_joomgallery/js/{ => imgjust}/imgjust.min.js (100%) diff --git a/media/com_joomgallery/joomla.asset.json b/media/com_joomgallery/joomla.asset.json index e04bbfb38..ab461cf4f 100644 --- a/media/com_joomgallery/joomla.asset.json +++ b/media/com_joomgallery/joomla.asset.json @@ -128,7 +128,7 @@ { "name": "com_joomgallery.justified", "type": "script", - "uri": "com_joomgallery/imgjust.min.js", + "uri": "com_joomgallery/imgjust/imgjust.min.js", "attributes": { "defer": true } diff --git a/media/com_joomgallery/js/imgjust.js b/media/com_joomgallery/js/imgjust.js deleted file mode 100644 index b1b40201b..000000000 --- a/media/com_joomgallery/js/imgjust.js +++ /dev/null @@ -1,149 +0,0 @@ -class ImgJust { - idealHeight = 150 - rowGap = 0 - columnGap = 0 - paddingLeft = 0 - paddingRight = 0 - paddingTop = 0 - paddingBottom = 0 - reload() { - const container = this.container; - const computedStyle = getComputedStyle(container); - const imgs = this.imgs; - const containerWidth = container.getBoundingClientRect().width - - this.paddingLeft - this.paddingRight; - if (containerWidth <= 0) - throw "ImgJust Error: No room for images. Client width is too small." - const idealImgWidths = []; - - // Compute ideal - for (var i = 0; i < imgs.length; i++) - idealImgWidths.push(imgs[i].naturalWidth * this.idealHeight / imgs[i].naturalHeight); - - const rowBadness = []; - const rowStart = []; - - // Complete first row - var badness = new Map(); - var start = new Map(); - var totalWidth = -this.columnGap; - for (var end = 0; end < imgs.length; end++) { - totalWidth += idealImgWidths[end] + this.columnGap; - const dif = totalWidth - containerWidth; - badness.set(end, dif * dif); - start.set(end, 0); - } - rowBadness.push(badness); - rowStart.push(start); - - // All other rows - for (var row = 1; row < imgs.length; row++) { - badness = new Map(); - start = new Map(); - - // for each possible terminating image - for (var end = row; end < imgs.length; end++) { - - // compute best starting image - totalWidth = idealImgWidths[end]; - const dif = totalWidth - containerWidth; - var minBad = dif * dif + rowBadness[row - 1].get(end - 1); - var bestBeg = end; - for (var beg = end - 1; beg >= row; beg--) { - totalWidth += idealImgWidths[beg] + this.columnGap; - const dif = totalWidth - containerWidth; - const bad = dif * dif + rowBadness[row - 1].get(beg - 1); - if (bad < minBad) { - minBad = bad; - bestBeg = beg; - } - } - badness.set(end, minBad); - start.set(end, bestBeg); - } - rowBadness.push(badness); - rowStart.push(start); - } - - // Find best terminating row - var row = 0; - var bestLastRow = row; - var minBad = rowBadness[row].get(imgs.length - 1); - for (row++; row < rowBadness.length; row++) { - const bad = rowBadness[row].get(imgs.length - 1); - if (bad < minBad) { - minBad = bad; - bestLastRow = row; - } - } - - // Assign start and stop index to each row - var rowRanges = []; - var prevRowStart = imgs.length; - for (var row = bestLastRow; row >= 0; row--) { - const end = prevRowStart - 1; - const start = rowStart[row].get(end); - rowRanges.unshift({start: start, end: end}); - prevRowStart = start; - } - - // Format images - for (var range of rowRanges) { - var totalImgWidth = 0; - for (var i = range.start; i <= range.end; i++) { - totalImgWidth += idealImgWidths[i]; - imgs[i].style.marginBottom = this.rowGap + "px"; - } - const containerWidthSpace = containerWidth - (range.end - range.start) * this.columnGap; - const newHeight = Math.round(this.idealHeight * containerWidthSpace / totalImgWidth); - var newRowWidth = 0; - for (var i = range.start; i < range.end; i++) { - const newWidth = Math.round(idealImgWidths[i] * containerWidthSpace / totalImgWidth); - newRowWidth += newWidth + this.columnGap; - imgs[i].style.width = newWidth + "px"; - imgs[i].style.height = newHeight + "px"; - imgs[i].style.marginRight = this.columnGap + "px"; - } - imgs[range.end].style.width = containerWidth - newRowWidth + "px"; - imgs[range.end].style.height = newHeight + "px"; - imgs[range.end].style.marginRight = "0"; - } - const lastRange = rowRanges[rowRanges.length - 1]; - for (var i = lastRange.start; i <= lastRange.end; i++) - imgs[i].style.marginBottom = "0"; - - // All done. Now make visible. - for (const img of imgs) - img.style.display = "block"; - } - - addImages(imgs) { - for (const img of imgs) { - img.style.display = "none"; - this.imgs.push(img); - } - } - - constructor(container, imgs = [], options = {}) { - for (var [key, val] of Object.entries(options)) - this[key] = val; - if (!container) - throw "ImgJust Error: missing first argument in constructor: container" - if (!imgs) - throw "ImgJust Error: missing second argument in constructor: imgs" - this.container = container; - this.imgs = []; - - container.style.display = "flex"; - container.style.flexFlow = "row wrap"; - container.style.paddingTop = this.paddingTop + "px"; - container.style.paddingBottom = this.paddingBottom + "px"; - container.style.paddingLeft = this.paddingLeft + "px"; - container.style.paddingRight = this.paddingRight + "px"; - - this.addImages(imgs); - this.reload() - - addEventListener("resize", _ => this.reload()); - } -} \ No newline at end of file diff --git a/media/com_joomgallery/js/imgjust/LICENSE b/media/com_joomgallery/js/imgjust/LICENSE deleted file mode 100644 index d159169d1..000000000 --- a/media/com_joomgallery/js/imgjust/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/media/com_joomgallery/js/imgjust/README.md b/media/com_joomgallery/js/imgjust/README.md index 7a107b089..6b68093a5 100644 --- a/media/com_joomgallery/js/imgjust/README.md +++ b/media/com_joomgallery/js/imgjust/README.md @@ -1,4 +1,8 @@ # ImgJust +## Credits +Thanks to the original repository of this library: +https://github.com/hikir1/ImgJust + ## Justified Image Wall Generator Use ImgJust to create a wall of images on your website. It's based on the LaTex paragraph justifying algorithm. @@ -38,7 +42,6 @@ addEventListener("load", _ => { ## Options & Defaults - idealHeight: 150 -- maxRowImgs = 16 - rowGap = 0 - columnGap = 0 - paddingLeft = 0 @@ -92,7 +95,3 @@ elements. ... ``` - -## Example Site - -See an [example](https://hikir1.github.io/ImgJust/example-site/index.html). diff --git a/media/com_joomgallery/js/imgjust/imgjust.js b/media/com_joomgallery/js/imgjust/imgjust.js index 4e7213e8b..b1b40201b 100644 --- a/media/com_joomgallery/js/imgjust/imgjust.js +++ b/media/com_joomgallery/js/imgjust/imgjust.js @@ -1,6 +1,5 @@ class ImgJust { idealHeight = 150 - maxRowImgs = 16 rowGap = 0 columnGap = 0 paddingLeft = 0 @@ -28,7 +27,7 @@ class ImgJust { var badness = new Map(); var start = new Map(); var totalWidth = -this.columnGap; - for (var end = 0; end < imgs.length && end < this.maxRowImgs; end++) { + for (var end = 0; end < imgs.length; end++) { totalWidth += idealImgWidths[end] + this.columnGap; const dif = totalWidth - containerWidth; badness.set(end, dif * dif); @@ -43,8 +42,8 @@ class ImgJust { start = new Map(); // for each possible terminating image - for (var end = row; end < imgs.length && end < row + this.maxRowImgs; end++) { - + for (var end = row; end < imgs.length; end++) { + // compute best starting image totalWidth = idealImgWidths[end]; const dif = totalWidth - containerWidth; @@ -67,9 +66,7 @@ class ImgJust { } // Find best terminating row - var row = rowBadness.length - this.maxRowImgs; - if (row < 0) - row = 0; + var row = 0; var bestLastRow = row; var minBad = rowBadness[row].get(imgs.length - 1); for (row++; row < rowBadness.length; row++) { @@ -79,7 +76,7 @@ class ImgJust { bestLastRow = row; } } - + // Assign start and stop index to each row var rowRanges = []; var prevRowStart = imgs.length; @@ -97,7 +94,7 @@ class ImgJust { totalImgWidth += idealImgWidths[i]; imgs[i].style.marginBottom = this.rowGap + "px"; } - const containerWidthSpace = containerWidth - (range.end - range.start)*this.columnGap; + const containerWidthSpace = containerWidth - (range.end - range.start) * this.columnGap; const newHeight = Math.round(this.idealHeight * containerWidthSpace / totalImgWidth); var newRowWidth = 0; for (var i = range.start; i < range.end; i++) { @@ -119,13 +116,15 @@ class ImgJust { for (const img of imgs) img.style.display = "block"; } + addImages(imgs) { for (const img of imgs) { img.style.display = "none"; this.imgs.push(img); } } - constructor(container, imgs=[], options={}) { + + constructor(container, imgs = [], options = {}) { for (var [key, val] of Object.entries(options)) this[key] = val; if (!container) @@ -147,4 +146,4 @@ class ImgJust { addEventListener("resize", _ => this.reload()); } -} +} \ No newline at end of file diff --git a/media/com_joomgallery/js/imgjust.min.js b/media/com_joomgallery/js/imgjust/imgjust.min.js similarity index 100% rename from media/com_joomgallery/js/imgjust.min.js rename to media/com_joomgallery/js/imgjust/imgjust.min.js