loading animation added

shows animation while new keyword proposals are requested and computed
kreuzverweis · May 24, 2012 · a5de2d3 · a5de2d3
1 parent e0cb2cd
commit a5de2d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/hooks/search.php b/hooks/search.php
@@ -19,7 +19,7 @@ function HookInline_keywordsSearchSearchbarbottomtoolbar()
                   </span>
                   <div id="skmessages"></div>                        
                   <div id="skproposals">    
-                      <img src="<?php echo $baseurl ?>/plugins/smartkeywording_rs/images/ui-anim_basic_16x16.gif" style="position:absolute;padding:0px;margin:5px;line-height:10px;top:0px;right:0px;display:none;" id="loadingDiv">                                                       
+                      <img src="<?php echo $baseurl ?>/plugins/smartkeywording_rs/images/ui-anim_basic_16x16.gif" style="width:16px;height:16px;padding:0px;top:0px;right:0px;" id="loadingAnimation">                                                       
                   </div>                                                                                
                   <input type="button" id="selectAllResourceButton" value="<?php echo $lang["selectall"]; ?>">
                   <input type="button" id="clearSelectedResourceButton" value="<?php echo $lang["unselectall"]; ?>">
@@ -92,15 +92,17 @@ function HookInline_keywordsSearchAdditionalheaderjs()
                     jQuery('#submitSelectedResourceButton').on('click', function() {
                         resourceIds = jQuery.map(jQuery('.chosen'), function(a, b){
                             return jQuery(a).attr('id').replace('ResourceShell','');
-                        }).join('+');
+                        }).join('+');                        
+                        jQuery("#loadingAnimation").show();
                         var selectedKeywords=getSelectedKeywords("skproposals");
+                        jQuery("#skproposals > span").remove();
                         jQuery.ajax({
                             type: "POST",
                             url: "<?php echo $baseurl; ?>/plugins/inline_keywords/pages/add_keywords.php",
                             data: { refs: resourceIds, keywords:  selectedKeywords}
                         }).done(function( msg ) {
-                            getProposals(0, selectedKeywords, function() {
-                                jQuery("#skproposals").empty();
+                            getProposals(0, selectedKeywords, function() {                                
+                                jQuery("#loadingAnimation").hide();
                                 addProposals(this);
                             })
                             if(msg !== ''){alert( "Data Saved: " + msg );}
@@ -110,6 +112,7 @@ function HookInline_keywordsSearchAdditionalheaderjs()
                             });
                         });
                     });
+                    jQuery("#loadingAnimation").hide();
                 });
             </script>
         <?php }

diff --git a/js/kreuzverweis.sk.inline.js b/js/kreuzverweis.sk.inline.js
@@ -36,8 +36,9 @@ function addSKProposalsOnReturn(fieldId, proposalContainerId) {
 				addedKeyword.text(jQuery(this).val());
 				jQuery("#skproposals").append(addedKeyword);
 				jQuery(this).val("");
-
+				jQuery("#loadingAnimation").show();
 				getProposals(0, getSelectedKeywords(proposalContainerId), function() {
+					jQuery("#loadingAnimation").hide();
 					addProposals(this);
 				})
 				return false;