From 6aaae062171bfc8e5046c3eae99bc9d63037120a Mon Sep 17 00:00:00 2001 From: Ken Sheedlo Date: Thu, 22 Aug 2013 14:56:42 -0600 Subject: feat(docs): linkify error messages on minErr docs pages --- docs/src/templates/js/docs.js | 44 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) (limited to 'docs/src/templates') diff --git a/docs/src/templates/js/docs.js b/docs/src/templates/js/docs.js index 9b38313b..b8c42ef8 100644 --- a/docs/src/templates/js/docs.js +++ b/docs/src/templates/js/docs.js @@ -1,7 +1,8 @@ var docsApp = { controller: {}, directive: {}, - serviceFactory: {} + serviceFactory: {}, + filter: {} }; docsApp.controller.DocsVersionsCtrl = ['$scope', '$window', 'NG_VERSIONS', 'NG_VERSION', function($scope, $window, NG_VERSIONS, NG_VERSION) { @@ -255,7 +256,40 @@ docsApp.directive.docTutorialReset = function() { }; -docsApp.directive.errorDisplay = ['$location', function ($location) { +docsApp.filter.errorLink = ['$sanitize', function ($sanitize) { + var LINKY_URL_REGEXP = /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s\.\;\,\(\)\{\}\<\>]/g, + MAILTO_REGEXP = /^mailto:/, + STACK_TRACE_REGEXP = /:\d+:\d+$/; + + var truncate = function (text, nchars) { + if (text.length > nchars) { + return text.substr(0, nchars - 3) + '...'; + } + return text; + }; + + return function (text, target) { + var targetHtml = target ? ' target="' + target + '"' : ''; + + if (!text) return text; + + return $sanitize(text.replace(LINKY_URL_REGEXP, function (url) { + if (STACK_TRACE_REGEXP.test(url)) { + return url; + } + + // if we did not match ftp/http/mailto then assume mailto + if (!/^((ftp|https?):\/\/|mailto:)/.test(url)) url = 'mailto:' + url; + + return '' + + truncate(url.replace(MAILTO_REGEXP, ''), 60) + + ''; + })); + }; +}]; + + +docsApp.directive.errorDisplay = ['$location', 'errorLinkFilter', function ($location, errorLinkFilter) { var interpolate = function (formatString) { var formatArgs = arguments; return formatString.replace(/\{\d+\}/g, function (match) { @@ -278,7 +312,7 @@ docsApp.directive.errorDisplay = ['$location', function ($location) { for (i = 0; angular.isDefined(search['p'+i]); i++) { formatArgs.push(search['p'+i]); } - element.text(interpolate.apply(null, formatArgs)); + element.html(errorLinkFilter(interpolate.apply(null, formatArgs), '_blank')); } }; }]; @@ -873,3 +907,7 @@ angular.module('docsApp', ['ngResource', 'ngRoute', 'ngCookies', 'ngSanitize', ' factory(docsApp.serviceFactory). directive(docsApp.directive). controller(docsApp.controller); + +angular.forEach(docsApp.filter, function (docsAppFilter, filterName) { + angular.module('docsApp').filter(filterName, docsAppFilter); +}); -- cgit v1.2.3