From 3347ec8c20332cf5675964c02e5ab2fec388730b Mon Sep 17 00:00:00 2001
From: Stefan Matheis <steffkes@apache.org>
Date: Wed, 23 Jan 2013 21:52:28 +0000
Subject: [PATCH] SOLR-4340: Admin UI - Analysis's Button Spinner goes wild

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1437764 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt                        | 3 +++
 solr/webapp/web/css/styles/analysis.css | 5 ++---
 solr/webapp/web/js/scripts/analysis.js  | 4 ++--
 solr/webapp/web/tpl/analysis.html       | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6e9f446ec0e..f56e2e6fb77 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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
 ----------------------
 
diff --git a/solr/webapp/web/css/styles/analysis.css b/solr/webapp/web/css/styles/analysis.css
index eb5182f8acd..f28737be219 100644
--- a/solr/webapp/web/css/styles/analysis.css
+++ b/solr/webapp/web/css/styles/analysis.css
@@ -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
diff --git a/solr/webapp/web/js/scripts/analysis.js b/solr/webapp/web/js/scripts/analysis.js
index 4736c2dc1e0..07a1106bdaa 100644
--- a/solr/webapp/web/js/scripts/analysis.js
+++ b/solr/webapp/web/js/scripts/analysis.js
@@ -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' );
                   }
                 }
diff --git a/solr/webapp/web/tpl/analysis.html b/solr/webapp/web/tpl/analysis.html
index 400622478df..76f5699c1c6 100644
--- a/solr/webapp/web/tpl/analysis.html
+++ b/solr/webapp/web/tpl/analysis.html
@@ -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>