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/01/09 22:20:16 UTC
svn commit: r1431086 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/webapp/ solr/webapp/web/js/scripts/index.js
Author: steffkes
Date: Wed Jan 9 21:20:16 2013
New Revision: 1431086
URL: http://svn.apache.org/viewvc?rev=1431086&view=rev
Log:
SOLR-4289: Admin UI - JVM memory bar - dark grey "used" width is too small (simplified) (merge r1431085)
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/index.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=1431086&r1=1431085&r2=1431086&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Jan 9 21:20:16 2013
@@ -1669,7 +1669,7 @@ Bug Fixes
fetchMailsSince was not specified. (Max Lynch via James Dyer)
* SOLR-4289: Admin UI - JVM memory bar - dark grey "used" width is too small
- (steffkes)
+ (steffkes, elyograg)
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js?rev=1431086&r1=1431085&r2=1431086&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js Wed Jan 9 21:20:16 2013
@@ -36,15 +36,13 @@ var generate_bar = function( bar_contain
$( '.bar-max.val', bar_holder ).text( bar_data['max'] );
bar_level++;
- var total_calc = bar_data['total']/bar_data['max'];
- $( '.bar-total.bar', bar_holder ).width( new String( total_calc*100 ) + '%' );
+ $( '.bar-total.bar', bar_holder ).width( new String( (bar_data['total']/bar_data['max'])*100 ) + '%' );
$( '.bar-total.val', bar_holder ).text( bar_data['total'] );
if( bar_data['used'] )
{
bar_level++;
- var used_calc = (bar_data['used']/bar_data['max'])/total_calc;
- $( '.bar-used.bar', bar_holder ).width( new String( used_calc*100 ) + '%' );
+ $( '.bar-used.bar', bar_holder ).width( new String( (bar_data['used']/bar_data['total'])*100 ) + '%' );
$( '.bar-used.val', bar_holder ).text( bar_data['used'] );
}