links highlighting

objectscript · Jun 11, 2015 · 4c692e3 · 4c692e3
1 parent 0ea9c0c
commit 4c692e3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "LightPivotTable",
   "author": "ZitRo",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
   "main": "test/testServer.js",
   "repository": {

diff --git a/source/js/PivotView.js b/source/js/PivotView.js
@@ -801,9 +801,13 @@ PivotView.prototype.renderRawData = function (data) {
     );
 
     var formatContent = function (value, element, format) {
-        if (!isFinite(value)) {
+        if (!isFinite(value)) { // not number, format as string
             element.className += " formatLeft";
-            element.textContent = value || "";
+            element.innerHTML = (value || "").replace(/(https?|ftp):\/\/[^\s]+/ig, function linkReplace (p) {
+                return "<a href='" + p
+                    + "' target='_blank' onclick='var e=event||window.event;e.stopPropagation();e.cancelBubble=true;'>"
+                    + p + "</a>";
+            });
         } else { // number
             if (format) { // set format
                 element.textContent = value ? _.numeral(value).format(format) : "";

diff --git a/test/testServer.js b/test/testServer.js
@@ -3,6 +3,6 @@ var express = require("express"),
 
 app.use(express.static(__dirname + "/.."));
 
-app.listen(80);
+app.listen(81);
 
 console.info("Server ready on port 80.");