Merge pull request #1407 from k-ave/fix-link-behaviour

fix link behaviour

Application.cfc

@@ -1,7 +1,7 @@
 component {
  this.name = "luceeDocumentationBuilder-" & Hash( GetCurrentTemplatePath() );
 
- variables.assetBundleVersion = 35; // must match lucee-docs\builders\html\assets\Gruntfile.js _version
+ variables.assetBundleVersion = 36; // must match lucee-docs\builders\html\assets\Gruntfile.js _version
 
  this.cwd = GetDirectoryFromPath( GetCurrentTemplatePath() )
 

builders/html/assets/Gruntfile.js

@@ -5,7 +5,7 @@ module.exports = function(grunt) {
  grunt.registerTask( 'default', [ 'concat:base', 'uglify:base', 'sass:base', 'sassUnicode:base', 'cssmin:base', 'copy:base'] );
 
 
- var _version = 35; // update in Application.cfc(s) too assetBundleVersion
+ var _version = 36; // update in Application.cfc(s) too assetBundleVersion
 
  // grunt config
  grunt.initConfig({

builders/html/assets/js/src/stats.js

@@ -12,23 +12,27 @@ $(function(){
  }, 750);
  // track outbound links
  $("a").click(function(){
- var url = $(this).attr("href");
- if (!url || url.indexOf("#") === 0)
+ let href = $(this).attr("href");
+
+ // ignore if no href or no length
+ if(!href || !href.length) return;
+
+ try {
+ // ignore if same hostname
+ if(window.location.hostname == new URL(href).hostname) return;
+ } catch(e){
+ // ignore invalid url
  return;
- if (url.indexOf("http") === -1){
- document.location = url; // ignore local urls
- } else {
- try {
- gtag('event', 'click', {
- 'event_category': 'outbound',
- 'event_label': url,
- 'transport_type': 'beacon',
- 'event_callback': function(){document.location = url;}
- });
- } catch(e){
- document.location = url;
- }
  }
+
+ // only track outgoing links
+ try {
+ gtag('event', 'click', {
+ 'event_category': 'outbound',
+ 'event_label': href,
+ 'transport_type': 'beacon'
+ });
+ } catch(e){}
  });
 });
 

server/Application.cfc

@@ -13,11 +13,11 @@ component {
  this.mappings[ "/builds" ] = this.baseDir & "builds";
  this.mappings[ "/docs" ] = this.baseDir & "docs";
  this.mappings[ "/listener" ] = this.baseDir;
- this.assetBundleVersion = 35; // see parent application.cfc
+ this.assetBundleVersion = 36; // see parent application.cfc
 
 
  public void function onApplicationStart() {
- application.assetBundleVersion = 35;
+ application.assetBundleVersion = 36;
  //_addChangeWatcher();
  }