From 2c18a125c6e8178a221700dbf05ea8755fdccacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2019 13:46:15 +0200 Subject: [PATCH] Revert "Renamed angular filter so it doesn't collide with the "truncate" one in Forms." This reverts commit f1cb89b249bdea3faf4b6d6ccf248f64b2056040. --- .../{advancedtruncate.filter.js => truncate.filter.js} | 6 +++--- .../src/views/common/overlays/itempicker/itempicker.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/Umbraco.Web.UI.Client/src/common/filters/{advancedtruncate.filter.js => truncate.filter.js} (86%) diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js similarity index 86% rename from src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js rename to src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js index 266c444fe5..5efe0f5fff 100644 --- a/src/Umbraco.Web.UI.Client/src/common/filters/advancedtruncate.filter.js +++ b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js @@ -1,7 +1,7 @@ /** * @ngdoc filter - * @name umbraco.filters.filter:advancedTruncate - * @namespace advancedTruncateFilter + * @name umbraco.filters.filter:truncate + * @namespace truncateFilter * * param {any} wordwise if true, the string will be cut after last fully displayed word. * param {any} max max length of the outputtet string @@ -10,7 +10,7 @@ * @description * Limits the length of a string, if a cut happens only the string will be appended with three dots to indicate that more is available. */ -angular.module("umbraco.filters").filter('advancedTruncate', +angular.module("umbraco.filters").filter('truncate', function () { return function (value, wordwise, max, tail) { if (!value) return ''; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html index 1594d6139e..a9f57fe304 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html @@ -24,7 +24,7 @@ - {{ pasteItem.name | advancedTruncate:true:36 }} + {{ pasteItem.name | truncate:true:36 }}