You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/08/19 19:37:23 UTC
svn commit: r1515528 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/webapp/ solr/webapp/web/js/scripts/app.js
Author: steffkes
Date: Mon Aug 19 17:37:22 2013
New Revision: 1515528
URL: http://svn.apache.org/r1515528
Log:
SOLR-5174: Admin UI - Query View doesn't highlight (json) Result if it contains HTML Tags (merge r1515527)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1515528&r1=1515527&r2=1515528&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Aug 19 17:37:22 2013
@@ -114,6 +114,9 @@ Bug Fixes
* SOLR-5171: SOLR Admin gui works in IE9, breaks in IE10. (Joseph L Howard via
steffkes)
+* SOLR-5174: Admin UI - Query View doesn't highlight (json) Result if it
+ contains HTML Tags (steffkes)
+
Optimizations
----------------------
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js?rev=1515528&r1=1515527&r2=1515528&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js Mon Aug 19 17:37:22 2013
@@ -552,7 +552,7 @@ var solr_admin = function( app_config )
json_str = JSON.stringify( JSON.parse( json_str ), undefined, 2 );
}
- return json_str;
+ return json_str.esc();
};
this.format_number = function format_number( number )