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/23 22:52:29 UTC
svn commit: r1437764 - in /lucene/dev/trunk/solr: CHANGES.txt
webapp/web/css/styles/analysis.css webapp/web/js/scripts/analysis.js
webapp/web/tpl/analysis.html
Author: steffkes
Date: Wed Jan 23 21:52:28 2013
New Revision: 1437764
URL: http://svn.apache.org/viewvc?rev=1437764&view=rev
Log:
SOLR-4340: Admin UI - Analysis's Button Spinner goes wild
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css
lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js
lucene/dev/trunk/solr/webapp/web/tpl/analysis.html
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1437764&r1=1437763&r2=1437764&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jan 23 21:52:28 2013
@@ -77,6 +77,9 @@ Optimizations
* SOLR-4339: Admin UI - Display Field-Flags on Schema-Browser
(steffkes)
+* SOLR-4340: Admin UI - Analysis's Button Spinner goes wild
+ (steffkes)
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css?rev=1437764&r1=1437763&r2=1437764&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css Wed Jan 23 21:52:28 2013
@@ -82,10 +82,9 @@
float: right;
}
-#content #analysis .settings button.loader
+#content #analysis .settings button span
{
- background-position: 2px 50%;
- padding-left: 21px;
+ background-image: url( ../../img/ico/funnel.png );
}
#content #analysis .settings .verbose_output
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js?rev=1437764&r1=1437763&r2=1437764&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js Wed Jan 23 21:52:28 2013
@@ -269,7 +269,7 @@ sammy.get
dataType : 'json',
beforeSend : function( xhr, settings )
{
- loader.show( button );
+ loader.show( $( 'span', button ) );
button.attr( 'disabled', true );
},
success : function( response, status_text, xhr, form )
@@ -325,7 +325,7 @@ sammy.get
},
complete : function()
{
- loader.hide( $( 'button', analysis_form ) );
+ loader.hide( $( 'span', button ) );
button.removeAttr( 'disabled' );
}
}
Modified: lucene/dev/trunk/solr/webapp/web/tpl/analysis.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/tpl/analysis.html?rev=1437764&r1=1437763&r2=1437764&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/tpl/analysis.html (original)
+++ lucene/dev/trunk/solr/webapp/web/tpl/analysis.html Wed Jan 23 21:52:28 2013
@@ -59,7 +59,7 @@ limitations under the License.
<div class="buttons clearfix">
- <button type="submit">Analyse Values</button>
+ <button type="submit"><span>Analyse Values</span></button>
<div class="verbose_output active">
<a>Verbose Output</a>