Merge pull request #6 from thexmanxyz/fix/lazy-load-hidden

Fix offcanvas lazy load, minified resources, prep. v1.1.5
thexmanxyz · Jun 18, 2019 · 73436bf · 73436bf
2 parents 9cd93ce + e0fbcc3
commit 73436bf
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -9,22 +9,22 @@ This project contains a Gantry Particle and adds a very powerful image render an
 * Gantry Templating Framework and Theme
 
 ## Download
-Choose the correct download for your target platform. The Joomla Plugin System is supported for all Gantry themes globally or locally for the templates Helium and Hydrogen. The latest Particle version is **v1.1.4**.
+Choose the correct download for your target platform. The Joomla Plugin System is supported for all Gantry themes globally or locally for the templates Helium and Hydrogen. The latest Particle version is **v1.1.5**.
 ___
 **Default Particle:**
-[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.particle.only.EN.v1.1.4.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.particle.only.DE.v1.1.4.zip)
+[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.particle.only.EN.v1.1.5.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.particle.only.DE.v1.1.5.zip)
 
 **Legacy Particle - Gantry <5.3.2:**
-[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.particle.only.legacy.EN.v1.1.4.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.particle.only.legacy.DE.v1.1.4.zip)
+[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.particle.only.legacy.EN.v1.1.5.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.particle.only.legacy.DE.v1.1.5.zip)
 
 **Joomla Plugin - All Templates (Global):**
-[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.j3.global.EN.v1.1.4.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.j3.global.DE.v1.1.4.zip)
+[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.j3.global.EN.v1.1.5.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.j3.global.DE.v1.1.5.zip)
 
 **Joomla Plugin - Hydrogen:**
-[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.j3.hydrogen.EN.v1.1.4.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.j3.hydrogen.DE.v1.1.4.zip)
+[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.j3.hydrogen.EN.v1.1.5.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.j3.hydrogen.DE.v1.1.5.zip)
 
 **Joomla Plugin - Helium:**
-[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.j3.helium.EN.v1.1.4.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.4/lih.j3.helium.DE.v1.1.4.zip)
+[English](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.j3.helium.EN.v1.1.5.zip) / [German](https://github.com/thexmanxyz/Logo-Image-Hover-Gantry/releases/download/v1.1.5/lih.j3.helium.DE.v1.1.5.zip)
 ___
 
 ## Automatic Installation (Joomla only)

diff --git a/build/build.bat b/build/build.bat
@@ -21,7 +21,7 @@ set scr_log_files=0
 
 REM --- project variables ---
 set prj_id=lih
-set prj_rev=v1.1.4
+set prj_rev=v1.1.5
 set prj_name=logo-image-hover
 set prj_fullname=Logo / Image / Hover - Particle
 set prj_title_hr=-----------------------------------

diff --git a/platform/joomla/global/logo-image-hover.xml b/platform/joomla/global/logo-image-hover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Logo | Imager | Hover - Gantry Particle (Global)</name>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <creationDate>17.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
@@ -27,6 +27,7 @@
         </files>
         <files folder="js" target="media/gantry5/engines/nucleus/js">
             <filename>logo-image-hover.js</filename>
+            <filename>logo-image-hover.min.js</filename>
         </files>
     </fileset>
 </extension>
diff --git a/platform/joomla/global/translation/de/logo-image-hover.xml b/platform/joomla/global/translation/de/logo-image-hover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Logo | Imager | Hover - Gantry Particle (Global)</name>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <creationDate>17.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
@@ -27,6 +27,7 @@
         </files>
         <files folder="js" target="media/gantry5/engines/nucleus/js">
             <filename>logo-image-hover.js</filename>
+            <filename>logo-image-hover.min.js</filename>
         </files>
     </fileset>
 </extension>
diff --git a/platform/joomla/helium/logo-image-hover.xml b/platform/joomla/helium/logo-image-hover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Logo | Imager | Hover - Gantry Particle (Helium)</name>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <creationDate>17.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
@@ -27,6 +27,7 @@
         </files>
         <files folder="js" target="templates/g5_helium/custom/js">
             <filename>logo-image-hover.js</filename>
+            <filename>logo-image-hover.min.js</filename>
         </files>
     </fileset>
 </extension>
diff --git a/platform/joomla/helium/translation/de/logo-image-hover.xml b/platform/joomla/helium/translation/de/logo-image-hover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Logo | Imager | Hover - Gantry Particle (Helium)</name>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <creationDate>17.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
@@ -27,6 +27,7 @@
         </files>
         <files folder="js" target="templates/g5_helium/custom/js">
             <filename>logo-image-hover.js</filename>
+            <filename>logo-image-hover.min.js</filename>
         </files>
     </fileset>
 </extension>
diff --git a/platform/joomla/hydrogen/logo-image-hover.xml b/platform/joomla/hydrogen/logo-image-hover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Logo | Imager | Hover - Gantry Particle (Hydrogen)</name>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <creationDate>17.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
@@ -27,6 +27,7 @@
         </files>
         <files folder="js" target="templates/g5_hydrogen/custom/js">
             <filename>logo-image-hover.js</filename>
+            <filename>logo-image-hover.min.js</filename>
         </files>
     </fileset>
 </extension>
diff --git a/platform/joomla/hydrogen/translation/de/logo-image-hover.xml b/platform/joomla/hydrogen/translation/de/logo-image-hover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <extension type="file" method="upgrade" version="3.0">
     <name>Logo | Imager | Hover - Gantry Particle (Hydrogen)</name>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <creationDate>17.06.2019</creationDate>
     <author>Andreas Kar</author>
     <authorEmail>[email protected]</authorEmail>
@@ -27,6 +27,7 @@
         </files>
         <files folder="js" target="templates/g5_hydrogen/custom/js">
             <filename>logo-image-hover.js</filename>
+            <filename>logo-image-hover.min.js</filename>
         </files>
     </fileset>
 </extension>
diff --git a/src/default/logo-image-hover.html.twig b/src/default/logo-image-hover.html.twig
@@ -93,6 +93,17 @@
             <script type="{{scriptType}}" src="{{url(jsPath)}}"{{jsExecAttr}}></script>
         {%- endscripts -%}
     {%- endif -%}
+    {%- if imageDefLazyLoad or imageHovLazyLoad -%}
+        {%- scripts in 'head' with { priority: '0' } -%}
+            <script>
+                jQuery(".g-offcanvas-toggle").on("touchstart click", function($) {
+                    if(typeof jQuery.lazyLoadXT !== 'undefined'){
+                        jQuery(".g-logo-image-hover img:not(.lazy-loaded)").lazyLoadXT({show: true});
+                    }
+                });
+            </script>
+        {%- endscripts -%}
+    {%- endif -%}
 </div>
 {%- endblock -%}
 

diff --git a/src/default/logo-image-hover.yaml b/src/default/logo-image-hover.yaml
@@ -459,7 +459,7 @@ form:
                   label: JS Path
                   description: Filename of the JS file or path on this server (relative from location) or on a different server (absolute).
                   placeholder: path/to/JS or filename
-                  default: logo-image-hover.js
+                  default: logo-image-hover.min.js
 
                 js.execution:
                   type: select.select

diff --git a/src/default/translation/de/logo-image-hover.yaml b/src/default/translation/de/logo-image-hover.yaml
@@ -459,7 +459,7 @@ form:
                   label: JS Pfad
                   description: Dateiname der JS Datei oder Pfad auf diesem Server (relativ zum Standort) bzw. auf einem anderen Server (absolut).
                   placeholder: Pfad/zum/JS oder Dateiname
-                  default: logo-image-hover.js
+                  default: logo-image-hover.min.js
 
                 js.execution:
                   type: select.select

diff --git a/src/js/logo-image-hover.js b/src/js/logo-image-hover.js
@@ -28,12 +28,12 @@ function LogoImageHover(){
                this.src = hoverImg;
         });  
     };
-    
+
     this.addMouseOutEvent = function($) {
         $(".g-logo-image-hover img").mouseout(function(){
             var defaultImg = $(this).attr("data-logo-out");
             if(typeof defaultImg !== 'undefined' && defaultImg.length > 0)
                this.src = defaultImg;
         });
-    }   
+    };
 }
diff --git a/src/js/logo-image-hover.min.js b/src/js/logo-image-hover.min.js
diff --git a/src/legacy/logo-image-hover.yaml b/src/legacy/logo-image-hover.yaml
@@ -461,7 +461,7 @@ form:
           label: JS Path
           description: Filename of the JS file or path on this server (relative from location) or on a different server (absolute).
           placeholder: path/to/JS or filename
-          default: logo-image-hover.js
+          default: logo-image-hover.min.js
 
         js.execution:
           type: select.select

diff --git a/src/legacy/translation/de/logo-image-hover.yaml b/src/legacy/translation/de/logo-image-hover.yaml
@@ -461,7 +461,7 @@ form:
           label: JS Pfad
           description: Dateiname der JS Datei oder Pfad auf diesem Server (relativ zum Standort) bzw. auf einem anderen Server (absolut).
           placeholder: Pfad/zum/JS oder Dateiname
-          default: logo-image-hover.js
+          default: logo-image-hover.min.js
 
         js.execution:
           type: select.select