From 6a2bd8b29fa8e7e4e70fc392a6c073ea3b518625 Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Mon, 31 Dec 2012 00:01:15 +0100 Subject: [PATCH 1/2] Don't replace data-src with src in acl-template On pageload an empty acl-list-item as template is created and not yet replaced. Don't change the data-src for src attributes in those images. --- js/acl.js | 5 ++--- view/theme/frost-mobile/js/acl.js | 5 ++--- view/theme/frost/js/acl.js | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/js/acl.js b/js/acl.js index 36cf74970f..35342a5c14 100644 --- 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 data-src attribute with src attribute for every image $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); that.update_view(); } diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js index 20f0d46189..c22991dd69 100644 --- 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 data-src attribute with src attribute for every image $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); that.update_view(); } diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js index 6b443b2481..95067f1749 100644 --- 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 data-src attribute with src attribute for every image $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); that.update_view(); } From 2943550fe289c67cbb1fcb50afa79ac2460a929d Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 2 Jan 2013 14:28:13 +0100 Subject: [PATCH 2/2] No need to remove data-src attributes Better comment string also --- js/acl.js | 2 +- js/main.js | 3 +-- view/theme/frost-mobile/js/acl.js | 2 +- view/theme/frost-mobile/js/main.js | 3 +-- view/theme/frost/js/acl.js | 2 +- view/theme/frost/js/main.js | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/js/acl.js b/js/acl.js index 35342a5c14..abdab97da1 100644 --- a/js/acl.js +++ b/js/acl.js @@ -254,7 +254,7 @@ ACL.prototype.populate = function(data){ that.list_content.append(html); }); $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ - // Add 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")); }); that.update_view(); diff --git a/js/main.js b/js/main.js index 5cdf2a0804..f17d1eaa0f 100644 --- 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 c22991dd69..4e319577f7 100644 --- a/view/theme/frost-mobile/js/acl.js +++ b/view/theme/frost-mobile/js/acl.js @@ -254,7 +254,7 @@ ACL.prototype.populate = function(data){ that.list_content.append(html); }); $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ - // Add 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")); }); that.update_view(); diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js index 197d496646..5a15b081bd 100644 --- 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 95067f1749..1c843d7fe3 100644 --- a/view/theme/frost/js/acl.js +++ b/view/theme/frost/js/acl.js @@ -254,7 +254,7 @@ ACL.prototype.populate = function(data){ that.list_content.append(html); }); $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ - // Add 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")); }); that.update_view(); diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js index 91e79ffc38..e47ecff376 100644 --- 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');