You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ge...@apache.org on 2019/04/27 14:40:32 UTC
[lucene-solr] branch branch_8x updated: SOLR-13343: Fix minor web
UI spacing issue
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 65d7dfd SOLR-13343: Fix minor web UI spacing issue
65d7dfd is described below
commit 65d7dfd5cf4a77a2d2af5dac38d036dbb91b4fbf
Author: Jason Gerlowski <ge...@gmail.com>
AuthorDate: Sat Apr 27 10:12:31 2019 -0400
SOLR-13343: Fix minor web UI spacing issue
Closes #592
---
solr/CHANGES.txt | 2 ++
solr/webapp/web/libs/ngtimeago.js | 7 +++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3a9495e..d07298b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -188,6 +188,8 @@ Bug Fixes
* SOLR-13081: In-Place Update doesn't work with route.field (Dr Oleg Savrasov via Mikhail Khludnev)
+* SOLR-13343: Fix spacing issue in browser log (Marcus Eagan via Jason Gerlowski)
+
Improvements
----------------------
diff --git a/solr/webapp/web/libs/ngtimeago.js b/solr/webapp/web/libs/ngtimeago.js
index f98b216..5592402 100644
--- a/solr/webapp/web/libs/ngtimeago.js
+++ b/solr/webapp/web/libs/ngtimeago.js
@@ -42,7 +42,7 @@ catalyst.filter('timeago', function() {
//refreshMillis= 6e4, //A minute
allowFuture = p_allowFuture || false,
strings= {
- prefixAgo: '',
+ prefixAgo: ' ',
prefixFromNow: '',
suffixAgo: "ago",
suffixFromNow: "from now",
@@ -89,12 +89,11 @@ catalyst.filter('timeago', function() {
days < 365 && substitute(strings.months, Math.round(days / 30), strings) ||
years < 1.5 && substitute(strings.year, 1, strings) ||
substitute(strings.years, Math.round(years), strings);
- console.log(prefix+words+suffix+separator);
+ console.log(words+" "+prefix+suffix);
prefix.replace(/ /g, '')
words.replace(/ /g, '')
suffix.replace(/ /g, '')
- return (prefix+' '+words+' '+suffix+' '+separator);
-
+ return (prefix+' '+words+' '+suffix+' '+separator);
};
});