Merge branch 'master' into dev

10 files changed, 95 insertions, 212 deletions

diff --git a/README.md b/README.md
index 6484bc1..67fdcfe 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ```
-Copyright (C) 2020-21 Andrea Lepori
+Copyright (C) 2020-23 Andrea Lepori
 
 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
diff --git a/accounts/templates/accounts/terms.html b/accounts/templates/accounts/terms.html
index ad56bae..b5689d0 100644
--- a/accounts/templates/accounts/terms.html
+++ b/accounts/templates/accounts/terms.html
@@ -8,7 +8,7 @@
 
 {% block content %}
   <div class="row">
-    <div class="col l4 offset-l4 m8 offset-m2 s12">
+    <div class="col l6 offset-l3 m8 offset-m2 s12">
       <div class="card">
         <div class="card-content">
           <h5>Termini e condizioni</h5>
@@ -35,9 +35,19 @@
           </blockquote>
           <h6>Trattamento dei dati</h6>
           <blockquote>
-            Tutti i dati inseriti verranno trattati in maniera confidenziale
-            e condivisi con i responsabili della sezione scout. I quali
-            li useranno per scopi organizzativi e non li condivideranno con terze parti.
+            I dati vengono trattati in conformità con la normativa sulla privacy
+            del Movimento Scout Svizzero (MSS) <a href="https://dse-it.scouts.ch/">https://dse-it.scouts.ch/</a>. In
+            particolare i dati possono essere condivisi all'interno di altre
+            associazioni scout (Scoutismo Ticino, MSS e eventuali altre) in caso
+            di necessità. Inoltre i dati possono essere condivisi con l'Ufficio
+            federale dello sport, l'Ufficio federale delle assicurazioni sociali
+            o la REGA in relazione a campi, corsi di formazione o altri eventi
+            sussidiati da Gioventù e Sport.<br>
+            Sono esenti alla sopracitata modalità i dati medici. Questi ultimi
+            sono trattati in maniera confidenziale e condivisi solamente con i
+            responsabili della sezione scout (Scout Breganzona). I quali li
+            useranno unicamente per scopi organizzativi e per eventuali
+            interventi medici d'urgenza.
           </blockquote>
         </div>
       </div>
diff --git a/client/templates/client/about.html b/client/templates/client/about.html
index 2069dfe..b0a3c27 100644
--- a/client/templates/client/about.html
+++ b/client/templates/client/about.html
@@ -19,7 +19,7 @@
           <a href={% url "terms" %}>Termini e condizioni</a>
           <h5>Licenza</h5>
           <blockquote>
-            Copyright (C) 2020-22 Andrea Lepori<br><br>
+            Copyright (C) 2020-23 Andrea Lepori<br><br>
 
             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
diff --git a/client/templates/client/index.html b/client/templates/client/index.html
index 96bd23b..ce71127 100644
--- a/client/templates/client/index.html
+++ b/client/templates/client/index.html
@@ -366,7 +366,11 @@
                     <div class="col s12">
                       <div class="card">
                         <div class="card-image">
-                          {% if doc.signed_doc %} <img class="lazyload" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}"> {% endif %}
+                          {% if doc.signed_doc %}
+                            <img class="lazy" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}">
+                          {% else %}
+                            <p>Foto della conferma firmata non caricata</p>
+                          {% endif %}
                         </div>
                       </div>
                     </div>
@@ -376,7 +380,11 @@
                     <div class="col s12">
                       <div class="card">
                         <div class="card-image">
-                          {% if doc.medical_data.health_care_certificate %}<img class="lazyload" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">{% endif %}
+                          {% if doc.medical_data.health_care_certificate %}
+                            <img class="lazy" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">
+                          {% else %}
+                            <p>Foto della tessera della cassa malati non caricata</p>
+                          {% endif %}
                         </div>
                       </div>
                     </div>
@@ -385,7 +393,11 @@
                     <div class="col s12">
                       <div class="card">
                         <div class="card-image">
-                          {% if doc.medical_data.vac_certificate %}<img class="lazyload" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">{% endif %}
+                          {% if doc.medical_data.vac_certificate %}
+                            <img class="lazy" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">
+                          {% else %}
+                            <p>Foto del certificato di vacinazione non caricato</p>
+                          {% endif %}
                         </div>
                       </div>
                     </div>
@@ -444,7 +456,9 @@ $(document).ready(function(){
         $('#modal_approve'+docid).modal('open');
       }
     {% endif %}
-    lazyload();
+    var lazyLoadInstance = new LazyLoad({
+      // Your custom settings go here
+    });
 });
 {% if user.is_staff or perms.client.approved %}
   $('*').click(function(event) {
diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html
index 06c8893..db1ee4e 100644
--- a/server/templates/server/doc_list.html
+++ b/server/templates/server/doc_list.html
@@ -437,7 +437,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.signed_doc %} <img class="lazyload" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}"> {% endif %}
+                        {% if doc.signed_doc %}
+                            <img class="lazy" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}">
+                          {% else %}
+                            <p>Foto della conferma firmata non caricata</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -447,7 +451,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.medical_data.health_care_certificate %}<img class="lazyload" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">{% endif %}
+                        {% if doc.medical_data.health_care_certificate %}
+                            <img class="lazy" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">
+                          {% else %}
+                            <p>Foto della tessera della cassa malati non caricata</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -456,7 +464,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.medical_data.vac_certificate %}<img class="lazyload" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">{% endif %}
+                        {% if doc.medical_data.vac_certificate %}
+                            <img class="lazy" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">
+                          {% else %}
+                            <p>Foto del certificato di vacinazione non caricato</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -487,7 +499,9 @@ $(document).ready(function(){
       update();
       document.getElementById('progress_bar').className = "determinate";
     {% endif %}
-    lazyload();
+    var lazyLoadInstance = new LazyLoad({
+      // Your custom settings go here
+    });
 });
 
 function resetModal() {
diff --git a/server/templates/server/doc_list_readonly.html b/server/templates/server/doc_list_readonly.html
index c29fb74..ab80242 100644
--- a/server/templates/server/doc_list_readonly.html
+++ b/server/templates/server/doc_list_readonly.html
@@ -417,7 +417,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.signed_doc %} <img class="lazyload" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}"> {% endif %}
+                        {% if doc.signed_doc %}
+                            <img class="lazy" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}">
+                          {% else %}
+                            <p>Foto della conferma firmata non caricata</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -427,7 +431,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.medical_data.health_care_certificate %}<img class="lazyload" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">{% endif %}
+                        {% if doc.medical_data.health_care_certificate %}
+                            <img class="lazy" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">
+                          {% else %}
+                            <p>Foto della tessera della cassa malati non caricata</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -436,7 +444,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.medical_data.vac_certificate %}<img class="lazyload" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">{% endif %}
+                        {% if doc.medical_data.vac_certificate %}
+                            <img class="lazy" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">
+                          {% else %}
+                            <p>Foto del certificato di vacinazione non caricato</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -467,7 +479,9 @@ $(document).ready(function(){
       update();
       document.getElementById('progress_bar').className = "determinate";
     {% endif %}
-    lazyload();
+    var lazyLoadInstance = new LazyLoad({
+      // Your custom settings go here
+    });
 });
 
 function resetModal() {
diff --git a/server/templates/server/user_list.html b/server/templates/server/user_list.html
index 6224df7..dffb8b2 100644
--- a/server/templates/server/user_list.html
+++ b/server/templates/server/user_list.html
@@ -271,7 +271,11 @@
                 <div class="col s12">
                   <div class="card">
                     <div class="card-image">
-                      {% if user.medic.health_care_certificate %}<img class="lazyload" data-src="{{ health_file.0 }}{{ user.id }}{{ health_file.1}}">{% endif %}
+                      {% if user.medic.health_care_certificate %}
+                        <img class="lazy" data-src="{{ health_file.0 }}{{ user.id }}{{ health_file.1}}">
+                      {% else %}
+                        <p>Foto della tessera della cassa malati non caricata</p>
+                      {% endif %}
                     </div>
                   </div>
                 </div>
@@ -280,7 +284,11 @@
                 <div class="col s12">
                   <div class="card">
                     <div class="card-image">
-                      {% if user.medic.vac_certificate %}<img class="lazyload" data-src="{{ vac_file.0 }}{{ user.id }}{{ vac_file.1 }}">{% endif %}
+                      {% if user.medic.vac_certificate %}
+                        <img class="lazy" data-src="{{ vac_file.0 }}{{ user.id }}{{ vac_file.1 }}">
+                      {% else %}
+                        <p>Foto del certificato di vacinazione non caricato</p>
+                      {% endif %}
                     </div>
                   </div>
                 </div>
@@ -313,7 +321,9 @@
 $(document).ready(function(){
     $('.modal').modal();
     $('.collapsible').collapsible();
-    lazyload();
+    var lazyLoadInstance = new LazyLoad({
+      // Your custom settings go here
+    });
 });
 
 function send(id) {
diff --git a/server/views.py b/server/views.py
index dd9bcec..141c9f7 100644
--- a/server/views.py
+++ b/server/views.py
@@ -233,13 +233,13 @@ def docapprove(request):
                     messages.append(data[i] + " - Formato errato")

                 elif Document.objects.filter(code=data[i]).count() == 0:

                     messages.append(data[i] + " - Invalido")

-                elif Document.objects.filter(code=data[i])[0].group.name not in groups:

+                elif Document.objects.filter(code=data[i])[0].group not in groups:

                     # check if user has permission to approve document

                     messages.append(data[i] + " - Invalido")

                 else:

                     document = Document.objects.filter(code=data[i])[0]

 

-                    if document.group.name not in groups:

+                    if document.group not in groups:

                         return

 

                     if document.status != 'wait' and document.status != 'ok':

@@ -265,14 +265,14 @@ def docapprove(request):
             elif Document.objects.filter(code=data).count() == 0:

                 error_text = "Codice invalido"

                 error = True

-            elif Document.objects.filter(code=data)[0].group.name not in groups:

+            elif Document.objects.filter(code=data)[0].group not in groups:

                 error_text = "Codice invalido"

                 error = True

             else:

                 # get document

                 document = Document.objects.filter(code=data)[0]

 

-                if document.group.name not in groups:

+                if document.group not in groups:

                     return

 

                 if document.status != 'wait' and document.status != 'ok':

@@ -342,7 +342,7 @@ def approve_direct(request):
             return

 

         # check if user has permission to approve document

-        if document.group.name not in groups:

+        if document.group not in groups:

             return

 

         document.status = "ok"

@@ -370,7 +370,7 @@ def approve_direct(request):
         return render(request, 'server/approve_doc_direct.html', {"error": "Questo documento non è in attesa di approvazione"})

 

     # check if user has permission to approve document

-    if document.group.name not in groups:

+    if document.group not in groups:

         return render(request, 'server/approve_doc_direct.html', {"error": "Non hai il permesso di approvare questo documento"})

 

     return render(request, 'server/approve_doc_direct.html', {"doc": document})

@@ -1795,7 +1795,7 @@ def docpreview(request):
 

         # get document

         document = Document.objects.filter(code=code)[0]

-        doc_group = document.group.name

+        doc_group = document.group

         parent_group = document.user.groups.values_list('name', flat=True)[0]

 

         # user has not permission to view document

@@ -1847,7 +1847,7 @@ def data_request(request):
             context["data"] = data

         elif request.POST["request"] == "data_user":

             perm = Permission.objects.get(codename="approved")

-            users = User.objects.filter(groups__name=parent_group, user_permissions=perm)

+            users = User.objects.filter(groups=parent_group, user_permissions=perm)

 

             # get time for filename

             current_time = datetime.strftime(datetime.now(), "%H_%M__%d_%m_%y")

@@ -1895,7 +1895,7 @@ def data_request(request):
 

         elif request.POST["request"] == "data_user_medic":

             perm = Permission.objects.get(codename="approved")

-            users = User.objects.filter(groups__name=parent_group, user_permissions=perm)

+            users = User.objects.filter(groups=parent_group, user_permissions=perm)

 

             # get time for filename

             current_time = datetime.strftime(datetime.now(), "%H_%M__%d_%m_%y")

@@ -1968,7 +1968,7 @@ def media_request(request, id=0, t="", flag=""):
         usercode = UserCode.objects.get(id=id)

         if request.user.is_staff:

             groups = getGroups(request)

-            usercode_group = usercode.user.groups[0]

+            usercode_group = list(usercode.user.groups.all())[0]

             if usercode_group not in groups:

                 return

         else:

diff --git a/static/lazyload.js b/static/lazyload.js
index 6b76a3c..73943af 100644
--- a/static/lazyload.js
+++ b/static/lazyload.js
@@ -1,180 +1 @@
-/*!
- * Lazy Load - JavaScript plugin for lazy loading images
- *
- * Copyright (c) 2007-2019 Mika Tuupola
- *
- * Licensed under the MIT license:
- *   http://www.opensource.org/licenses/mit-license.php
- *
- * Project home:
- *   https://appelsiini.net/projects/lazyload
- *
- * Version: 2.0.0-rc.2
- *
- */
-
-(function (root, factory) {
-    if (typeof exports === "object") {
-        module.exports = factory(root);
-    } else if (typeof define === "function" && define.amd) {
-        define([], factory);
-    } else {
-        root.LazyLoad = factory(root);
-    }
-}) (typeof global !== "undefined" ? global : this.window || this.global, function (root) {
-
-    "use strict";
-
-    if (typeof define === "function" && define.amd){
-        root = window;
-    }
-
-    const defaults = {
-        src: "data-src",
-        srcset: "data-srcset",
-        selector: ".lazyload",
-        root: null,
-        rootMargin: "0px",
-        threshold: 0
-    };
-
-    /**
-    * Merge two or more objects. Returns a new object.
-    * @private
-    * @param {Boolean}  deep     If true, do a deep (or recursive) merge [optional]
-    * @param {Object}   objects  The objects to merge together
-    * @returns {Object}          Merged values of defaults and options
-    */
-    const extend = function ()  {
-
-        let extended = {};
-        let deep = false;
-        let i = 0;
-        let length = arguments.length;
-
-        /* Check if a deep merge */
-        if (Object.prototype.toString.call(arguments[0]) === "[object Boolean]") {
-            deep = arguments[0];
-            i++;
-        }
-
-        /* Merge the object into the extended object */
-        let merge = function (obj) {
-            for (let prop in obj) {
-                if (Object.prototype.hasOwnProperty.call(obj, prop)) {
-                    /* If deep merge and property is an object, merge properties */
-                    if (deep && Object.prototype.toString.call(obj[prop]) === "[object Object]") {
-                        extended[prop] = extend(true, extended[prop], obj[prop]);
-                    } else {
-                        extended[prop] = obj[prop];
-                    }
-                }
-            }
-        };
-
-        /* Loop through each object and conduct a merge */
-        for (; i < length; i++) {
-            let obj = arguments[i];
-            merge(obj);
-        }
-
-        return extended;
-    };
-
-    function LazyLoad(images, options) {
-        this.settings = extend(defaults, options || {});
-        this.images = images || document.querySelectorAll(this.settings.selector);
-        this.observer = null;
-        this.init();
-    }
-
-    LazyLoad.prototype = {
-        init: function() {
-
-            /* Without observers load everything and bail out early. */
-            if (!root.IntersectionObserver) {
-                this.loadImages();
-                return;
-            }
-
-            let self = this;
-            let observerConfig = {
-                root: this.settings.root,
-                rootMargin: this.settings.rootMargin,
-                threshold: [this.settings.threshold]
-            };
-
-            this.observer = new IntersectionObserver(function(entries) {
-                Array.prototype.forEach.call(entries, function (entry) {
-                    if (entry.isIntersecting) {
-                        self.observer.unobserve(entry.target);
-                        let src = entry.target.getAttribute(self.settings.src);
-                        let srcset = entry.target.getAttribute(self.settings.srcset);
-                        if ("img" === entry.target.tagName.toLowerCase()) {
-                            if (src) {
-                                entry.target.src = src;
-                            }
-                            if (srcset) {
-                                entry.target.srcset = srcset;
-                            }
-                        } else {
-                            entry.target.style.backgroundImage = "url(" + src + ")";
-                        }
-                    }
-                });
-            }, observerConfig);
-
-            Array.prototype.forEach.call(this.images, function (image) {
-                self.observer.observe(image);
-            });
-        },
-
-        loadAndDestroy: function () {
-            if (!this.settings) { return; }
-            this.loadImages();
-            this.destroy();
-        },
-
-        loadImages: function () {
-            if (!this.settings) { return; }
-
-            let self = this;
-            Array.prototype.forEach.call(this.images, function (image) {
-                let src = image.getAttribute(self.settings.src);
-                let srcset = image.getAttribute(self.settings.srcset);
-                if ("img" === image.tagName.toLowerCase()) {
-                    if (src) {
-                        image.src = src;
-                    }
-                    if (srcset) {
-                        image.srcset = srcset;
-                    }
-                } else {
-                    image.style.backgroundImage = "url('" + src + "')";
-                }
-            });
-        },
-
-        destroy: function () {
-            if (!this.settings) { return; }
-            this.observer.disconnect();
-            this.settings = null;
-        }
-    };
-
-    root.lazyload = function(images, options) {
-        return new LazyLoad(images, options);
-    };
-
-    if (root.jQuery) {
-        const $ = root.jQuery;
-        $.fn.lazyload = function (options) {
-            options = options || {};
-            options.attribute = options.attribute || "data-src";
-            new LazyLoad($.makeArray(this), options);
-            return this;
-        };
-    }
-
-    return LazyLoad;
-});
+!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(n="undefined"!=typeof globalThis?globalThis:n||self).LazyLoad=t()}(this,(function(){"use strict";function n(){return n=Object.assign||function(n){for(var t=1;t<arguments.length;t++){var e=arguments[t];for(var i in e)Object.prototype.hasOwnProperty.call(e,i)&&(n[i]=e[i])}return n},n.apply(this,arguments)}var t="undefined"!=typeof window,e=t&&!("onscroll"in window)||"undefined"!=typeof navigator&&/(gle|ing|ro)bot|crawl|spider/i.test(navigator.userAgent),i=t&&"IntersectionObserver"in window,o=t&&"classList"in document.createElement("p"),a=t&&window.devicePixelRatio>1,r={elements_selector:".lazy",container:e||t?document:null,threshold:300,thresholds:null,data_src:"src",data_srcset:"srcset",data_sizes:"sizes",data_bg:"bg",data_bg_hidpi:"bg-hidpi",data_bg_multi:"bg-multi",data_bg_multi_hidpi:"bg-multi-hidpi",data_bg_set:"bg-set",data_poster:"poster",class_applied:"applied",class_loading:"loading",class_loaded:"loaded",class_error:"error",class_entered:"entered",class_exited:"exited",unobserve_completed:!0,unobserve_entered:!1,cancel_on_exit:!0,callback_enter:null,callback_exit:null,callback_applied:null,callback_loading:null,callback_loaded:null,callback_error:null,callback_finish:null,callback_cancel:null,use_native:!1,restore_on_error:!1},c=function(t){return n({},r,t)},l=function(n,t){var e,i="LazyLoad::Initialized",o=new n(t);try{e=new CustomEvent(i,{detail:{instance:o}})}catch(n){(e=document.createEvent("CustomEvent")).initCustomEvent(i,!1,!1,{instance:o})}window.dispatchEvent(e)},u="src",s="srcset",d="sizes",f="poster",_="llOriginalAttrs",g="data",v="loading",b="loaded",m="applied",p="error",h="native",E="data-",I="ll-status",y=function(n,t){return n.getAttribute(E+t)},k=function(n){return y(n,I)},w=function(n,t){return function(n,t,e){var i="data-ll-status";null!==e?n.setAttribute(i,e):n.removeAttribute(i)}(n,0,t)},A=function(n){return w(n,null)},L=function(n){return null===k(n)},O=function(n){return k(n)===h},x=[v,b,m,p],C=function(n,t,e,i){n&&(void 0===i?void 0===e?n(t):n(t,e):n(t,e,i))},N=function(n,t){o?n.classList.add(t):n.className+=(n.className?" ":"")+t},M=function(n,t){o?n.classList.remove(t):n.className=n.className.replace(new RegExp("(^|\\s+)"+t+"(\\s+|$)")," ").replace(/^\s+/,"").replace(/\s+$/,"")},z=function(n){return n.llTempImage},T=function(n,t){if(t){var e=t._observer;e&&e.unobserve(n)}},R=function(n,t){n&&(n.loadingCount+=t)},G=function(n,t){n&&(n.toLoadCount=t)},j=function(n){for(var t,e=[],i=0;t=n.children[i];i+=1)"SOURCE"===t.tagName&&e.push(t);return e},D=function(n,t){var e=n.parentNode;e&&"PICTURE"===e.tagName&&j(e).forEach(t)},H=function(n,t){j(n).forEach(t)},V=[u],F=[u,f],B=[u,s,d],J=[g],P=function(n){return!!n[_]},S=function(n){return n[_]},U=function(n){return delete n[_]},$=function(n,t){if(!P(n)){var e={};t.forEach((function(t){e[t]=n.getAttribute(t)})),n[_]=e}},q=function(n,t){if(P(n)){var e=S(n);t.forEach((function(t){!function(n,t,e){e?n.setAttribute(t,e):n.removeAttribute(t)}(n,t,e[t])}))}},K=function(n,t,e){N(n,t.class_applied),w(n,m),e&&(t.unobserve_completed&&T(n,t),C(t.callback_applied,n,e))},Q=function(n,t,e){N(n,t.class_loading),w(n,v),e&&(R(e,1),C(t.callback_loading,n,e))},W=function(n,t,e){e&&n.setAttribute(t,e)},X=function(n,t){W(n,d,y(n,t.data_sizes)),W(n,s,y(n,t.data_srcset)),W(n,u,y(n,t.data_src))},Y={IMG:function(n,t){D(n,(function(n){$(n,B),X(n,t)})),$(n,B),X(n,t)},IFRAME:function(n,t){$(n,V),W(n,u,y(n,t.data_src))},VIDEO:function(n,t){H(n,(function(n){$(n,V),W(n,u,y(n,t.data_src))})),$(n,F),W(n,f,y(n,t.data_poster)),W(n,u,y(n,t.data_src)),n.load()},OBJECT:function(n,t){$(n,J),W(n,g,y(n,t.data_src))}},Z=["IMG","IFRAME","VIDEO","OBJECT"],nn=function(n,t){!t||function(n){return n.loadingCount>0}(t)||function(n){return n.toLoadCount>0}(t)||C(n.callback_finish,t)},tn=function(n,t,e){n.addEventListener(t,e),n.llEvLisnrs[t]=e},en=function(n,t,e){n.removeEventListener(t,e)},on=function(n){return!!n.llEvLisnrs},an=function(n){if(on(n)){var t=n.llEvLisnrs;for(var e in t){var i=t[e];en(n,e,i)}delete n.llEvLisnrs}},rn=function(n,t,e){!function(n){delete n.llTempImage}(n),R(e,-1),function(n){n&&(n.toLoadCount-=1)}(e),M(n,t.class_loading),t.unobserve_completed&&T(n,e)},cn=function(n,t,e){var i=z(n)||n;on(i)||function(n,t,e){on(n)||(n.llEvLisnrs={});var i="VIDEO"===n.tagName?"loadeddata":"load";tn(n,i,t),tn(n,"error",e)}(i,(function(o){!function(n,t,e,i){var o=O(t);rn(t,e,i),N(t,e.class_loaded),w(t,b),C(e.callback_loaded,t,i),o||nn(e,i)}(0,n,t,e),an(i)}),(function(o){!function(n,t,e,i){var o=O(t);rn(t,e,i),N(t,e.class_error),w(t,p),C(e.callback_error,t,i),e.restore_on_error&&q(t,B),o||nn(e,i)}(0,n,t,e),an(i)}))},ln=function(n,t,e){!function(n){return Z.indexOf(n.tagName)>-1}(n)?function(n,t,e){!function(n){n.llTempImage=document.createElement("IMG")}(n),cn(n,t,e),function(n){P(n)||(n[_]={backgroundImage:n.style.backgroundImage})}(n),function(n,t,e){var i=y(n,t.data_bg),o=y(n,t.data_bg_hidpi),r=a&&o?o:i;r&&(n.style.backgroundImage='url("'.concat(r,'")'),z(n).setAttribute(u,r),Q(n,t,e))}(n,t,e),function(n,t,e){var i=y(n,t.data_bg_multi),o=y(n,t.data_bg_multi_hidpi),r=a&&o?o:i;r&&(n.style.backgroundImage=r,K(n,t,e))}(n,t,e),function(n,t,e){var i=y(n,t.data_bg_set);if(i){var o=i.split("|"),a=o.map((function(n){return"image-set(".concat(n,")")}));n.style.backgroundImage=a.join(),""===n.style.backgroundImage&&(a=o.map((function(n){return"-webkit-image-set(".concat(n,")")})),n.style.backgroundImage=a.join()),K(n,t,e)}}(n,t,e)}(n,t,e):function(n,t,e){cn(n,t,e),function(n,t,e){var i=Y[n.tagName];i&&(i(n,t),Q(n,t,e))}(n,t,e)}(n,t,e)},un=function(n){n.removeAttribute(u),n.removeAttribute(s),n.removeAttribute(d)},sn=function(n){D(n,(function(n){q(n,B)})),q(n,B)},dn={IMG:sn,IFRAME:function(n){q(n,V)},VIDEO:function(n){H(n,(function(n){q(n,V)})),q(n,F),n.load()},OBJECT:function(n){q(n,J)}},fn=function(n,t){(function(n){var t=dn[n.tagName];t?t(n):function(n){if(P(n)){var t=S(n);n.style.backgroundImage=t.backgroundImage}}(n)})(n),function(n,t){L(n)||O(n)||(M(n,t.class_entered),M(n,t.class_exited),M(n,t.class_applied),M(n,t.class_loading),M(n,t.class_loaded),M(n,t.class_error))}(n,t),A(n),U(n)},_n=["IMG","IFRAME","VIDEO"],gn=function(n){return n.use_native&&"loading"in HTMLImageElement.prototype},vn=function(n,t,e){n.forEach((function(n){return function(n){return n.isIntersecting||n.intersectionRatio>0}(n)?function(n,t,e,i){var o=function(n){return x.indexOf(k(n))>=0}(n);w(n,"entered"),N(n,e.class_entered),M(n,e.class_exited),function(n,t,e){t.unobserve_entered&&T(n,e)}(n,e,i),C(e.callback_enter,n,t,i),o||ln(n,e,i)}(n.target,n,t,e):function(n,t,e,i){L(n)||(N(n,e.class_exited),function(n,t,e,i){e.cancel_on_exit&&function(n){return k(n)===v}(n)&&"IMG"===n.tagName&&(an(n),function(n){D(n,(function(n){un(n)})),un(n)}(n),sn(n),M(n,e.class_loading),R(i,-1),A(n),C(e.callback_cancel,n,t,i))}(n,t,e,i),C(e.callback_exit,n,t,i))}(n.target,n,t,e)}))},bn=function(n){return Array.prototype.slice.call(n)},mn=function(n){return n.container.querySelectorAll(n.elements_selector)},pn=function(n){return function(n){return k(n)===p}(n)},hn=function(n,t){return function(n){return bn(n).filter(L)}(n||mn(t))},En=function(n,e){var o=c(n);this._settings=o,this.loadingCount=0,function(n,t){i&&!gn(n)&&(t._observer=new IntersectionObserver((function(e){vn(e,n,t)}),function(n){return{root:n.container===document?null:n.container,rootMargin:n.thresholds||n.threshold+"px"}}(n)))}(o,this),function(n,e){t&&(e._onlineHandler=function(){!function(n,t){var e;(e=mn(n),bn(e).filter(pn)).forEach((function(t){M(t,n.class_error),A(t)})),t.update()}(n,e)},window.addEventListener("online",e._onlineHandler))}(o,this),this.update(e)};return En.prototype={update:function(n){var t,o,a=this._settings,r=hn(n,a);G(this,r.length),!e&&i?gn(a)?function(n,t,e){n.forEach((function(n){-1!==_n.indexOf(n.tagName)&&function(n,t,e){n.setAttribute("loading","lazy"),cn(n,t,e),function(n,t){var e=Y[n.tagName];e&&e(n,t)}(n,t),w(n,h)}(n,t,e)})),G(e,0)}(r,a,this):(o=r,function(n){n.disconnect()}(t=this._observer),function(n,t){t.forEach((function(t){n.observe(t)}))}(t,o)):this.loadAll(r)},destroy:function(){this._observer&&this._observer.disconnect(),t&&window.removeEventListener("online",this._onlineHandler),mn(this._settings).forEach((function(n){U(n)})),delete this._observer,delete this._settings,delete this._onlineHandler,delete this.loadingCount,delete this.toLoadCount},loadAll:function(n){var t=this,e=this._settings;hn(n,e).forEach((function(n){T(n,t),ln(n,e,t)}))},restoreAll:function(){var n=this._settings;mn(n).forEach((function(t){fn(t,n)}))}},En.load=function(n,t){var e=c(t);ln(n,e)},En.resetStatus=function(n){A(n)},t&&function(n,t){if(t)if(t.length)for(var e,i=0;e=t[i];i+=1)l(n,e);else l(n,t)}(En,window.lazyLoadOptions),En}));
diff --git a/version.txt b/version.txt
index e463c6e..f2779d8 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
 version=0.6
-rev=21
+rev=22