Author: olamy
Date: Tue Oct 16 22:04:29 2012
New Revision: 1399016
URL: http://svn.apache.org/viewvc?rev=1399016&view=rev
Log:
add loading state to button while saving datas
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java?rev=1399016&r1=1399015&r2=1399016&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
Tue Oct 16 22:04:29 2012
@@ -533,7 +533,7 @@ public class DefaultArchivaConfiguration
private void escapeCronExpressions( Configuration configuration )
{
- for ( ManagedRepositoryConfiguration c :
(List<ManagedRepositoryConfiguration>) configuration.getManagedRepositories() )
+ for ( ManagedRepositoryConfiguration c :
configuration.getManagedRepositories() )
{
c.setRefreshCronExpression( escapeCronExpression(
c.getRefreshCronExpression() ) );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1399016&r1=1399015&r2=1399016&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
Tue Oct 16 22:04:29 2012
@@ -204,6 +204,8 @@ define("archiva.proxy-connectors",["jque
this.save=function(){
//FIXME data controls !!!
clearUserMessages();
+ $("#user-messages" ).html(mediumSpinnerImg());
+ $("#proxy-connector-btn-save" ).button("loading");
// update is delete then add
if (this.update){
$.ajax("restServices/archivaServices/proxyConnectorService/updateProxyConnector",
@@ -220,6 +222,10 @@ define("archiva.proxy-connectors",["jque
error: function(data) {
var res = $.parseJSON(data.responseText);
displayRestError(res);
+ },
+ complete: function(){
+ removeMediumSpinnerImg("#user-messages");
+ $("#proxy-connector-btn-save" ).button("reset");
}
}
);
@@ -240,6 +246,10 @@ define("archiva.proxy-connectors",["jque
error: function(data) {
var res = $.parseJSON(data.responseText);
displayRestError(res);
+ },
+ complete: function(){
+ removeMediumSpinnerImg("#user-messages");
+ $("#proxy-connector-btn-save" ).button("reset");
}
}
);
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1399016&r1=1399015&r2=1399016&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Tue Oct 16 22:04:29 2012
@@ -1038,7 +1038,7 @@
</div>
</fieldset>
- <button id="proxy-connector-btn-save" data-bind="click: save"
class="btn">${$.i18n.prop('save')}</button>
+ <button id="proxy-connector-btn-save" data-bind="click: save"
data-loading-text="${$.i18n.prop('common.loading')}"
class="btn">${$.i18n.prop('save')}</button>
{{if modified()}}
${("#network-proxy-btn-save").button('reset')}
{{/if}}
