Merge branch 'dev' of https://github.com/ESSolutions/ESSArch_Tools_Archive into dev

Author: OskarPersson

ESSArch_TA/frontend/static/frontend/scripts/controllers/VersionCtrl.js

@@ -30,18 +30,9 @@ angular.module('myApp').controller('VersionCtrl', function($scope, myService, $w
         $window.open('http://www.essolutions.se', '_blank');
     };
     $scope.scrollToLink = function(link) {
-        if(!isURL(link)) {
-            $location.hash(link);
-            $anchorScroll();
-        } else {
-            $window.open(link, '_blank');
-            return true;
-        }
-    }
-    function isURL(str) {
-        var urlRegex = '^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$';
-        var url = new RegExp(urlRegex, 'i');
-        return str.length < 2083 && url.test(str);
+        $location.hash(link);
+        $anchorScroll();
+
     }
     $scope.docs = $translate.instant('DOCS');
     $scope.sysInfo = $translate.instant('SYSTEMINFORMATION');

ESSArch_TA/frontend/static/frontend/scripts/myApp.js

@@ -148,13 +148,22 @@ angular.module('myApp', ['ngRoute', 'treeControl', 'ui.bootstrap', 'formly', 'fo
     $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
 }])
 .config(['markedProvider', function (markedProvider) {
+    function isURL(str) {
+        var urlRegex = '^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$';
+        var url = new RegExp(urlRegex, 'i');
+        return str.length < 2083 && url.test(str);
+    }
   markedProvider.setOptions({
       gfm: true,
       tables: true,
   });
   markedProvider.setRenderer({
-    link: function(href, title, text) {
-      return "<a ng-click='scrollToLink(\"" + href + "\")'" + ">" + text + "</a>";
+      link: function(href, title, text) {
+          if(!isURL(href)) {
+            return "<a ng-click='scrollToLink(\"" + href + "\")'" + ">" + text + "</a>";
+        } else {
+            return "<a href='" + href + "'" + (title ? " title='" + title + "'" : '') + " target='_blank'>" + text + "</a>";
+        }
     }
   });
 }])