Projet

Général

Profil

0001-set-the-correct-href-for-external-urls-8823.patch

Serghei Mihai (congés, retour 15/05), 25 novembre 2015 18:17

Télécharger (3,8 ko)

Voir les différences: 

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(-)
www/index.html
161 161 
        </script>
162 162 

  		




  163
  163
  
    
        <script type="text/x-tmpl" id="momo-list-item-tmpl">

  		




  164
  
  
    
            <a href="#{%= o.id %}" class="{% if(!o.header){ %} list-group-item {% } %} clearfix">

  		




  
  164
  
    
            <a href="{% if(!o.external) { %}#{%= o.id %}{% } else { %}{%= o.url %}{% } %}" class="{% if(!o.header){ %} list-group-item {% } %} clearfix" target="_system">

  		




  165
  165
  
    
                {% if(o.header){ %}

  		




  166
  166
  
    
                    <span class="pull-left">

  		




  167
  167
  
    
                        {% if(o.icon){ %}

  		




  ......




  196
  196
  
    

  		




  197
  197
  
    
        <script type="text/x-tmpl" id="momo-icon-item-tmpl">

  		




  198
  198
  
    
            <div class="col-xs-{%= o.colxs %} col-sm-{%= o.colsm %} col-md-{%= o.colmd %} col-lg-{%= o.collg %}">

  		




  199
  
  
    
                <a href="#{%= o.id %}" class="btn btn-block text-center {%= o.className || 'btn-default' %}">

  		




  
  199
  
    
                <a href="{% if(!o.external) { %}#{%= o.id %}{% } else { %}{%= o.url %}{% } %}" class="btn btn-block text-center {%= o.className || 'btn-default' %}" target="_system">

  		




  200
  200
  
    
                    {% if(o.external){ %}

  		




  201
  201
  
    
                        <i class="fa fa-external-link top-right"></i>

  		




  202
  202
  
    
                    {% } %}

  		




  ......




  309
  309
  
    
                        <div class="row">

  		




  310
  310
  
    
                            <div class="col-xs-6 navbar-btn text-left">

  		




  311
  311
  
    
                                <a href="https://dev.entrouvert.org/projects/momo/"

  		




  312
  
  
    
                                    class="btn btn-success pull-left momo-repo" 

  		




  313
  
  
    
                                    target="_system"

  		




  314
  
  
    
                                    onclick="javascript:app.utils.onExternalLinkClick()">Momo repository</a>

  		




  
  312
  
    
                                    class="btn btn-success pull-left momo-repo" target="_system">Momo repository</a>

  		




  315
  313
  
    
                            </div>

  		




  316
  314
  
    
                            <div class="col-xs-6 navbar-btn text-right">

  		




  317
  315
  
    
                                <a href="mailto:{%= o.meta.contact %}" 

  		












  

    
      www/js/index.js
    
  





  851
  851
  
    
            window.history.back();

  		




  852
  852
  
    
            return false;

  		




  853
  853
  
    
        } else

  		




  854
  
  
    
        if(page_obj.external){

  		




  855
  
  
    
            app.utils.openExternalURL(page_obj.url, page_obj.inAppBrowser);

  		




  856
  
  
    
            return false;

  		




  857
  
  
    
        }

  		




  858
  854
  
    

  		




  859
  855
  
    
        // Keep try to navigate until previous animation is done.

  		




  860
  856
  
    
        if(app.isAnimating) {

  		




  ......




  1304
  1300
  
    
            }

  		




  1305
  1301
  
    
        },

  		




  1306
  1302
  
    

  		




  1307
  
  
    
        onExternalLinkClick: function(e){

  		




  1308
  
  
    
            e = e || window.event;

  		




  1309
  
  
    
            var targ = e.target || e.srcElement;

  		




  1310
  
  
    
            if (targ.nodeType === 3){ targ = targ.parentNode; }

  		




  1311
  
  
    
            var url = targ.getAttribute("href");

  		




  1312
  
  
    
            app.utils.openExternalURL(url);

  		




  1313
  
  
    
            return false;

  		




  1314
  
  
    
        },

  		




  1315
  
  
    

  		




  1316
  
  
    
        openExternalURL: function(url, inAppBrowser){

  		




  1317
  
  
    
            //if(inAppBrowser){

  		




  1318
  
  
    
            //    cordova.InAppBrowser.open(url);

  		




  1319
  
  
    
            //} else {

  		




  1320
  
  
    
                if(navigator.app){ // Android

  		




  1321
  
  
    
                    navigator.app.loadUrl(encodeURI(url), { openExternal:true });

  		




  1322
  
  
    
                } else { // iOS and others

  		




  1323
  
  
    
                    window.open(encodeURI(url), "_system", 'location=yes'); // opens in the app, not in safari

  		




  1324
  
  
    
                }

  		




  1325
  
  
    
            //}

  		




  1326
  
  
    
            return false;

  		




  1327
  
  
    
        },

  		




  1328
  
  
    

  		




  1329
  1303
  
    
        extend: function ( defaults, options ) {

  		




  1330
  1304
  
    
            var extended = {};

  		




  1331
  1305
  
    
            var prop;

  		




  1332
  
  
    
-