Browse Source

Merge pull request #2834 from Hypolite/Issue-#2800

Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode
pull/2838/head
rabuzarus 5 years ago
committed by GitHub
parent
commit
b59f8fe9e0
3 changed files with 15 additions and 8 deletions
  1. +7
    -4
      view/templates/head.tpl
  2. +7
    -3
      view/theme/frio/templates/head.tpl
  3. +1
    -1
      view/theme/frio/templates/nav.tpl

+ 7
- 4
view/templates/head.tpl View File

@ -18,12 +18,15 @@
<link rel="shortcut icon" href="{{$shortcut_icon}}" />
<link rel="apple-touch-icon" href="{{$touch_icon}}"/>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<script>
// Prevents links to switch to Safari in a home screen app - see https://gist.github.com/irae/1042167
(function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(chref=d.href).replace(e.href,"").indexOf("#")&&(!/^[a-z\+\.\-]+:/i.test(chref)||chref.indexOf(e.protocol+"//"+e.host)===0)&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone");
</script>
<link rel="search"
href="{{$baseurl}}/opensearch"
type="application/opensearchdescription+xml"
href="{{$baseurl}}/opensearch"
type="application/opensearchdescription+xml"
title="Search in Friendica" />
<!--[if IE]>


+ 7
- 3
view/theme/frio/templates/head.tpl View File

@ -39,11 +39,15 @@
<link rel="shortcut icon" href="{{$shortcut_icon}}" />
<link rel="apple-touch-icon" href="{{$touch_icon}}"/>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<script>
// Prevents links to switch to Safari in a home screen app - see https://gist.github.com/irae/1042167
(function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(chref=d.href).replace(e.href,"").indexOf("#")&&(!/^[a-z\+\.\-]+:/i.test(chref)||chref.indexOf(e.protocol+"//"+e.host)===0)&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone");
</script>
<link rel="search"
href="{{$baseurl}}/opensearch"
type="application/opensearchdescription+xml"
href="{{$baseurl}}/opensearch"
type="application/opensearchdescription+xml"
title="Search in Friendica" />


+ 1
- 1
view/theme/frio/templates/nav.tpl View File

@ -275,7 +275,7 @@
{{*The second part of the notifications dropdown menu. It handles the notifications *}}
{{if $nav.notifications}}
<ul id="nav-notifications-template" class="media-list" style="display:none;" rel="template"> <!-- needs further investigation. I thought the notifications have their own templates -->
<ul id="nav-notifications-template" class="media-list" style="display:none;" rel="template">
<li class="{4} notif-entry">
<div class="notif-entry-wrapper media">
<div class="notif-photo-wrapper media-object pull-left"><a href="{6}"><img data-src="{1}"></a></div>


Loading…
Cancel
Save