diff options
| author | friendica <info@friendica.com> | 2014-05-01 17:56:03 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-01 17:56:03 -0700 |
| commit | a8322ba1f65d3cc82678103d86ac924fb6581e5e (patch) | |
| tree | 80c2f3837f5458cd53e6a3d165439af21eb263a1 | |
| parent | b9ae19c540e3664b4cc609b849da59ce27a1af91 (diff) | |
| parent | e243da3647c38b587a06e121e171c6ab663af618 (diff) | |
| download | volse-hubzilla-a8322ba1f65d3cc82678103d86ac924fb6581e5e.tar.gz volse-hubzilla-a8322ba1f65d3cc82678103d86ac924fb6581e5e.tar.bz2 volse-hubzilla-a8322ba1f65d3cc82678103d86ac924fb6581e5e.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | view/js/acl.js | 7 | ||||
| -rw-r--r-- | view/js/main.js | 7 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/hdr.tpl | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index 28e47011f..c129634a0 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -258,11 +258,16 @@ ACL.prototype.populate = function(data){ that.list_content.height(height); $(data.items).each(function(){ html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; - html = html.format( this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable ); + html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable); if (this.uids!=undefined) that.group_uids[this.id] = this.uids; //console.log(html); that.list_content.append(html); }); + $("#acl-list-content .acl-list-item img[data-src]").each(function(i, el){ + // Replace 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/js/main.js b/view/js/main.js index 38cde749c..17ef578be 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -645,12 +645,15 @@ function updateConvItems(mode,data) { } else { $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); - $(data.notify).each(function() { html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.class); $("#nav-" + notifyType + "-menu").append(html); }); - + $(".dropdown-menu img[data-src]").each(function(i, el){ + // Replace data-src attribute with src attribute for every image + $(el).attr('src', $(el).data("src")); + $(el).removeAttr("data-src"); + }); } }); diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index c98350843..722d541ed 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -15,7 +15,7 @@ <span id="acl-fields"></span> </div> <div class="acl-list-item" rel="acl-template" style="display:none"> - <img src="{0}"><p>{1}</p> + <img data-src="{0}"><p>{1}</p> <button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button> <button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button> </div> diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index efb43224c..fdcc4521c 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> + <li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> </ul> |