Author: olamy
Date: Fri Oct 12 22:16:41 2012
New Revision: 1397732
URL: http://svn.apache.org/viewvc?rev=1397732&view=rev
Log:
switch button to toggle state while deleting
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1397732&r1=1397731&r2=1397732&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Fri Oct 12 22:16:41 2012
@@ -107,6 +107,7 @@ define("archiva.search",["jquery","i18n"
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"
displayRestError(data,"user-messages");
},
complete:function(){
+ $("#dialog-confirm-modal-ok").button('reset');
closeDialogConfirm();
}
});
@@ -222,6 +224,7 @@ define("archiva.search",["jquery","i18n"
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"
displayRestError( data,"user-messages");
},
complete:function(){
+ $("#dialog-confirm-modal-ok").button('reset');
closeDialogConfirm();
}
});
@@ -603,6 +607,7 @@ define("archiva.search",["jquery","i18n"
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"
displayRestError(data,"user-messages");
},
complete:function(){
+ $("#dialog-confirm-modal-ok").button('reset');
closeDialogConfirm();
}
});
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html?rev=1397732&r1=1397731&r2=1397732&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
Fri Oct 12 22:16:41 2012
@@ -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>
