From 3ea830e22152e2d2ded6cad28599e22061406bbe Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Fri, 3 Mar 2017 21:45:36 -0500
Subject: [PATCH] Strip @hubzilla.server part from guid for autoscrolling
 purpuses

---
 view/theme/frio/js/mod_display.js         | 3 ++-
 view/theme/frio/templates/wall_thread.tpl | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/view/theme/frio/js/mod_display.js b/view/theme/frio/js/mod_display.js
index 86608821e5..ed126d60cd 100644
--- a/view/theme/frio/js/mod_display.js
+++ b/view/theme/frio/js/mod_display.js
@@ -4,8 +4,9 @@
 
 // Catch the GUID from the URL
 var itemGuid = window.location.pathname.split("/").pop();
+var itemGuidSafe = itemGuid.replace(/%.*/, '');
 
 $(window).load(function(){
 	// Scroll to the Item by its GUID
-	scrollToItem('item-'+itemGuid);
+	scrollToItem('item-' + itemGuidSafe);
 });
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index e71dc7b84c..1977f541c2 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -68,9 +68,9 @@ as the value of $top_child_total (this is done at the end of this file)
 
 {{* Use a different div container in dependence max thread-level = 7 *}}
 {{if $item.thread_level<7}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid|regex_replace:'/%.*/':''}}"><!-- wall-item-container -->
 {{else}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid|regex_replace:'/%.*/':''}}">
  {{/if}}
 	<div class="media">
 		{{* Put addional actions in a top-right dropdown menu *}}