Merge pull request #573 from oohlaf/fixes

Don't add src attributes inside acl-template

diff --git a/js/acl.js b/js/acl.js
index 36cf74970fbac1e83df66fa67da46f4d0711040c..abdab97da19aa8fb035b984b3fb126a36534a38a 100644 (file)
--- a/js/acl.js
+++ b/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
                //console.log(html);
                that.list_content.append(html);
        });
-       $(".acl-list-item img[data-src]").each(function(i, el){
-               // Replace data-src attribute with src attribute for every image
+       $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+               // Add src attribute for images with a data-src attribute
                $(el).attr('src', $(el).data("src"));
-               $(el).removeAttr("data-src");
        });
        that.update_view();
 }

diff --git a/js/main.js b/js/main.js
index 5cdf2a08047d0a13bf7b290ef3f352b3b838b00e..f17d1eaa0f747a2790b3e3070b9944f59231d2bb 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -183,9 +183,8 @@
                                });
 
                                $("img[data-src]", nnm).each(function(i, el){
-                                       // Replace data-src attribute with src attribute for every image
+                                       // Add src attribute for images with a data-src attribute
                                        $(el).attr('src', $(el).data("src"));
-                                       $(el).removeAttr("data-src");
                                });
                        }
 

diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js
index 20f0d461895cc1898d8fd28c8def9b9d1798b0c8..4e319577f78b80f2aca06b4ae80e8372920c8f78 100644 (file)
--- a/view/theme/frost-mobile/js/acl.js
+++ b/view/theme/frost-mobile/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
                //console.log(html);
                that.list_content.append(html);
        });
-       $(".acl-list-item img[data-src]").each(function(i, el){
-               // Replace data-src attribute with src attribute for every image
+       $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+               // Add src attribute for images with a data-src attribute
                $(el).attr('src', $(el).data("src"));
-               $(el).removeAttr("data-src");
        });
        that.update_view();
 }

diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 197d496646cfcdfab30acc123b7d23d8756ed482..5a15b081bd0cf51ad5286312c05f8295fb3ec20f 100644 (file)
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -189,9 +189,8 @@
                                });
 
                                $("img[data-src]", nnm).each(function(i, el){
-                                       // Replace data-src attribute with src attribute for every image
+                                       // Add src attribute for images with a data-src attribute
                                        $(el).attr('src', $(el).data("src"));
-                                       $(el).removeAttr("data-src");
                                });
                        }
                        notif = eNotif.attr('count');

diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js
index 6b443b248165c582b9f87d863d9e4f6bea3598ca..1c843d7fe383b669e6141ca1d68bcba9ac64194a 100644 (file)
--- a/view/theme/frost/js/acl.js
+++ b/view/theme/frost/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
                //console.log(html);
                that.list_content.append(html);
        });
-       $(".acl-list-item img[data-src]").each(function(i, el){
-               // Replace data-src attribute with src attribute for every image
+       $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+               // Add src attribute for images with a data-src attribute
                $(el).attr('src', $(el).data("src"));
-               $(el).removeAttr("data-src");
        });
        that.update_view();
 }

diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 91e79ffc383164f9619dd44e4e663fd8a0c7be49..e47ecff376bd6f40dca6d66994ebe3564d49087d 100644 (file)
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -181,9 +181,8 @@
                                });
 
                                $("img[data-src]", nnm).each(function(i, el){
-                                       // Replace data-src attribute with src attribute for every image
+                                       // Add src attribute for images with a data-src attribute
                                        $(el).attr('src', $(el).data("src"));
-                                       $(el).removeAttr("data-src");
                                });
                        }
                        notif = eNotif.attr('count');