switch button to toggle state while deleting

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1397732 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index 24a0d152ebd0664bc4181f6cdfbfab2006712e31..b1ac8efeae7b5764a957e22ee4a28343b329eded 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -107,6 +107,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
       var previousHash=getUrlHash();
       $.log("previousHash:"+previousHash);
       openDialogConfirm(function(){
+        $("#dialog-confirm-modal-ok").button('loading');
         $.ajax({
           url:"restServices/archivaServices/repositoriesService/deleteGroupId?groupId="+groupId+"&repositoryId="+repoId,
           type:"GET",
@@ -119,6 +120,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
             displayRestError(data,"user-messages");
           },
           complete:function(){
+            $("#dialog-confirm-modal-ok").button('reset');
             closeDialogConfirm();
           }
         });
@@ -222,6 +224,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
       clearUserMessages();
         var artifact = new Artifact(repoId,null,self.groupId,self.artifactId,repoId,version);
         openDialogConfirm(function(){
+          $("#dialog-confirm-modal-ok").button('loading');
           $.ajax({
             url:"restServices/archivaServices/repositoriesService/deleteArtifact",
             type:"POST",
@@ -236,6 +239,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
               displayRestError( data,"user-messages");
             },
             complete:function(){
+              $("#dialog-confirm-modal-ok").button('reset');
               closeDialogConfirm();
             }
           });
@@ -603,6 +607,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
       clearUserMessages();
 
       openDialogConfirm(function(){
+        $("#dialog-confirm-modal-ok").button('loading');
         $.ajax({
           url:"restServices/archivaServices/repositoriesService/deleteArtifact",
           type:"POST",
@@ -627,6 +632,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
             displayRestError(data,"user-messages");
           },
           complete:function(){
+            $("#dialog-confirm-modal-ok").button('reset');
             closeDialogConfirm();
           }
         });

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
index 811ab31c3f3aa7b4357b3dab92ccd4c76b8c63ba..aebb5c88e0025db80dc4d3fc4a6ca30a3d6ab360 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
@@ -25,7 +25,7 @@
    <p id="dialog-confirm-modal-body-text"></p>
   </div>
   <div class="modal-footer">
-    <a class="btn btn-secondary" id="dialog-confirm-modal-cancel">${$.i18n.prop('cancel')}</a>
+    <a class="btn btn-secondary" id="dialog-confirm-modal-cancel" data-loading-text="${$.i18n.prop('common.loading')}">${$.i18n.prop('cancel')}</a>
     <a class="btn btn-primary" id="dialog-confirm-modal-ok">${$.i18n.prop('ok')}</a>
   </div>
 </div>
@@ -37,5 +37,4 @@
     </div>
     <div class="modal-body" id="dialog-modal-merge-repo-body-text">>
     </div>
-
 </div>