From c50dff0a59499e031fef1d08eddc04c114cfda90 Mon Sep 17 00:00:00 2001
From: Serghei MIHAI <smihai@entrouvert.com>
Date: Mon, 2 Nov 2015 07:45:25 +0100
Subject: [PATCH] set the correct href for external urls (#8823)

---
 www/index.html  |  8 +++-----
 www/js/index.js | 26 --------------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/www/index.html b/www/index.html
index bc1c370..8890b95 100644
--- a/www/index.html
+++ b/www/index.html
@@ -161,7 +161,7 @@
         </script>
 
         <script type="text/x-tmpl" id="momo-list-item-tmpl">
-            <a href="#{%= o.id %}" class="{% if(!o.header){ %} list-group-item {% } %} clearfix">
+            <a href="{% if(!o.external) { %}#{%= o.id %}{% } else { %}{%= o.url %}{% } %}" class="{% if(!o.header){ %} list-group-item {% } %} clearfix" target="_system">
                 {% if(o.header){ %}
                     <span class="pull-left">
                         {% if(o.icon){ %}
@@ -196,7 +196,7 @@
 
         <script type="text/x-tmpl" id="momo-icon-item-tmpl">
             <div class="col-xs-{%= o.colxs %} col-sm-{%= o.colsm %} col-md-{%= o.colmd %} col-lg-{%= o.collg %}">
-                <a href="#{%= o.id %}" class="btn btn-block text-center {%= o.className || 'btn-default' %}">
+                <a href="{% if(!o.external) { %}#{%= o.id %}{% } else { %}{%= o.url %}{% } %}" class="btn btn-block text-center {%= o.className || 'btn-default' %}" target="_system">
                     {% if(o.external){ %}
                         <i class="fa fa-external-link top-right"></i>
                     {% } %}
@@ -309,9 +309,7 @@
                         <div class="row">
                             <div class="col-xs-6 navbar-btn text-left">
                                 <a href="https://dev.entrouvert.org/projects/momo/"
-                                    class="btn btn-success pull-left momo-repo" 
-                                    target="_system"
-                                    onclick="javascript:app.utils.onExternalLinkClick()">Momo repository</a>
+                                    class="btn btn-success pull-left momo-repo" target="_system">Momo repository</a>
                             </div>
                             <div class="col-xs-6 navbar-btn text-right">
                                 <a href="mailto:{%= o.meta.contact %}" 
diff --git a/www/js/index.js b/www/js/index.js
index 78d7d18..4abb98d 100644
--- a/www/js/index.js
+++ b/www/js/index.js
@@ -851,10 +851,6 @@ var app = {
             window.history.back();
             return false;
         } else
-        if(page_obj.external){
-            app.utils.openExternalURL(page_obj.url, page_obj.inAppBrowser);
-            return false;
-        }
 
         // Keep try to navigate until previous animation is done.
         if(app.isAnimating) {
@@ -1304,28 +1300,6 @@ var app = {
             }
         },
 
-        onExternalLinkClick: function(e){
-            e = e || window.event;
-            var targ = e.target || e.srcElement;
-            if (targ.nodeType === 3){ targ = targ.parentNode; }
-            var url = targ.getAttribute("href");
-            app.utils.openExternalURL(url);
-            return false;
-        },
-
-        openExternalURL: function(url, inAppBrowser){
-            //if(inAppBrowser){
-            //    cordova.InAppBrowser.open(url);
-            //} else {
-                if(navigator.app){ // Android
-                    navigator.app.loadUrl(encodeURI(url), { openExternal:true });
-                } else { // iOS and others
-                    window.open(encodeURI(url), "_system", 'location=yes'); // opens in the app, not in safari
-                }
-            //}
-            return false;
-        },
-
         extend: function ( defaults, options ) {
             var extended = {};
             var prop;
-- 
2.6.2