Author: olamy
Date: Mon Nov 19 21:02:08 2012
New Revision: 1411408
URL: http://svn.apache.org/viewvc?rev=1411408&view=rev
Log:
reuse selector!
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
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/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1411408&r1=1411407&r2=1411408&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Mon Nov 19 21:02:08 2012
@@ -521,9 +521,10 @@ define("archiva.general-admin",["jquery"
this.networkConfiguration=ko.observable(networkConfiguration);
save=function(){
- $("#user-messages" ).html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
var mainContent=$("#main-content");
- if (!$("#main-content"
).find("#network-configuration-edit-form").valid()){
+ if (!mainContent.find("#network-configuration-edit-form").valid()){
return;
}
mainContent.find("#network-configuration-btn-save" ).button('loading');
@@ -536,7 +537,7 @@ define("archiva.general-admin",["jquery"
displaySuccessMessage( $.i18n.prop("network-configuration.updated"));
},
complete: function(){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
mainContent.find("#network-configuration-btn-save" ).button('reset');
}
});
@@ -605,7 +606,8 @@ define("archiva.general-admin",["jquery"
var self=this;
save=function(){
var mainContent=$("#main-content" );
- $("#user-messages").html( mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html( mediumSpinnerImg());
mainContent.find("#ui-configuration-btn-save" ).button('loading');
$.ajax("restServices/archivaServices/archivaAdministrationService/setUiConfiguration",
{
type: "POST",
@@ -616,7 +618,7 @@ define("archiva.general-admin",["jquery"
displaySuccessMessage( $.i18n.prop("ui-configuration.updated"));
},
complete: function(){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
mainContent.find("#ui-configuration-btn-save" ).button('reset');
}
});
@@ -856,7 +858,8 @@ define("archiva.general-admin",["jquery"
return;
}
clearUserMessages();
- $("#user-messages" ).html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
mainContent.find("#appearance-configuration-btn-save"
).button('loading');
$.ajax("restServices/archivaServices/archivaAdministrationService/setOrganisationInformation",
{
type: "POST",
@@ -871,7 +874,7 @@ define("archiva.general-admin",["jquery"
displayErrorMessage($.i18n.prop('appearance-configuration.updating-error'));
},
complete: function(){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
mainContent.find("#appearance-configuration-btn-save"
).button('reset');
}
});
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js?rev=1411408&r1=1411407&r2=1411408&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
Mon Nov 19 21:02:08 2012
@@ -88,7 +88,8 @@ define("archiva.proxy-connectors-rules",
this.saveProxyConnectorRule=function(proxyConnectorRule,url,add,completeFnCallback){
$.log("saveProxyConnectorRule:"+url);
- $("#user-messages" ).html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
$.ajax(url,
{
type: "POST",
@@ -112,7 +113,7 @@ define("archiva.proxy-connectors-rules",
displayRestError(res);
},
complete:function(data){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
if(completeFnCallback){
completeFnCallback();
}
@@ -134,7 +135,8 @@ define("archiva.proxy-connectors-rules",
this.deleteProxyConnectorRule=function(proxyConnectorRule){
$("#main-content"
).find("proxy-connectors-rules-view-tabsTable").find(".btn").button("loading");
- $("#user-messages" ).html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
$.ajax("restServices/archivaServices/proxyConnectorRuleService/deleteProxyConnectorRule",
{
type:"POST",
@@ -151,7 +153,7 @@ define("archiva.proxy-connectors-rules",
displayRestError(res);
},
complete:function(data){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
$("#main-content"
).find("proxy-connectors-rules-view-tabsTable").find(".btn").button("reset");
}
}
@@ -278,7 +280,8 @@ define("archiva.proxy-connectors-rules",
screenChange();
var mainContent = $("#main-content");
mainContent.html($("#proxyConnectorsRulesMain").tmpl());
- $("#user-messages").html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
loadAllProxyConnectors(function(data){
var proxyConnectors = mapProxyConnectors(data);
@@ -292,7 +295,7 @@ define("archiva.proxy-connectors-rules",
activateProxyConnectorRulesGridTab();
},
complete: function(data){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
}
});
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=1411408&r1=1411407&r2=1411408&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
Mon Nov 19 21:02:08 2012
@@ -204,7 +204,8 @@ define("archiva.proxy-connectors",["jque
this.save=function(){
//FIXME data controls !!!
clearUserMessages();
- $("#user-messages" ).html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
$("#proxy-connector-btn-save" ).button("loading");
// update is delete then add
if (this.update){
@@ -224,7 +225,7 @@ define("archiva.proxy-connectors",["jque
displayRestError(res);
},
complete: function(){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
$("#proxy-connector-btn-save" ).button("reset");
}
}
@@ -248,7 +249,7 @@ define("archiva.proxy-connectors",["jque
displayRestError(res);
},
complete: function(){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
$("#proxy-connector-btn-save" ).button("reset");
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1411408&r1=1411407&r2=1411408&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Mon Nov 19 21:02:08 2012
@@ -244,7 +244,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
},
complete: function(){
$("#managed-repository-save-button" ).button('reset');
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
}
});
}
@@ -561,7 +561,8 @@ function(jquery,i18n,jqueryTmpl,bootstra
}
mergeRepo=function(managedRepository){
- $("#user-messages" ).html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
// is there any artifacts to merge ?
var artifactsNumberUrl =
"restServices/archivaServices/browseService/artifacts/"+encodeURIComponent(managedRepository.id());
$.ajax(artifactsNumberUrl,{
@@ -595,8 +596,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
},
complete: function(){
- $.log("complete removeMediumSpinnerImg");
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
}
}
);
@@ -647,7 +647,8 @@ function(jquery,i18n,jqueryTmpl,bootstra
doMerge=function(sourceRepository,targetRepository,skipConflicts){
$.log("doMerge:"+sourceRepository+" to " + targetRepository + ",
skipConflicts: " + skipConflicts);
window.modalMergeRepoDialog.modal('hide');
- $("#user-messages" ).html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
var url =
"restServices/archivaServices/mergeRepositoriesService/mergeRepositories/"+encodeURIComponent(sourceRepository);
url+="/"+encodeURIComponent(targetRepository);
url+="/"+skipConflicts;
@@ -658,7 +659,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
displaySuccessMessage($.i18n.prop("managedrepository.merge.success",
sourceRepository,targetRepository));
},
complete: function(){
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
}
});
}
@@ -1181,7 +1182,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
ko.applyBindings(managedRepositoriesViewModel,mainContent.find("#managed-repositories-view").get(0));
activatePopoverDoc();
mainContent.find("#managed-repositories-pills
#managed-repositories-view-a").tab('show');
- removeMediumSpinnerImg("#main-content
#managed-repositories-content");
+
removeMediumSpinnerImg(mainContent.find("#managed-repositories-content"));
activateManagedRepositoriesGridTab();
if(successFnManagedRepositories){
successFnManagedRepositories(managedRepositoriesViewModel);
@@ -1220,7 +1221,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
var mainContent = $("#main-content");
ko.applyBindings(remoteRepositoriesViewModel,mainContent.find("#remote-repositories-view").get(0));
mainContent.find("#remote-repositories-pills
#remote-repositories-view-a").tab('show')
- removeMediumSpinnerImg("#main-content
#remote-repositories-content");
+
removeMediumSpinnerImg(mainContent.find("#remote-repositories-content"));
activatePopoverDoc();
if(successFnRemoteRepositories){
successFnRemoteRepositories(managedRepositoriesViewModel);
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js?rev=1411408&r1=1411407&r2=1411408&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
Mon Nov 19 21:02:08 2012
@@ -207,7 +207,8 @@ function(jquery,i18n,jqueryTmpl,bootstra
this.saveRepositoryGroup=function(repositoryGroup){
clearUserMessages();
- $("#user-messages").html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
$("#repository-group-save" ).button('loading');
$.ajax("restServices/archivaServices/repositoryGroupService/updateRepositoryGroup",
{
@@ -227,7 +228,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
},
complete:function(data){
$("#repository-group-save" ).button('reset');
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
}
}
);
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=1411408&r1=1411407&r2=1411408&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
Mon Nov 19 21:02:08 2012
@@ -86,15 +86,12 @@
{{/each}}
<th>Releases</th>
<th>Snapshots</th>
- <!--th
title="${$.i18n.prop('managedrepository.scan.index')}">${$.i18n.prop('managedrepository.scan.grid.header')}</th-->
<th>${$.i18n.prop('managedrepository.actions')}</th>
<th>${$.i18n.prop('edit')}</th>
<th>${$.i18n.prop('delete')}</th>
<th>${$.i18n.prop('modified')}</th>
- <!--th>${$.i18n.prop('description')}</th-->
<th>${$.i18n.prop('managed.repository.rss.header')}</th>
<th
title="${$.i18n.prop('managedrepository.stats')}">${$.i18n.prop('managedrepository.stats.grid.header')}</th>
- <!--th
title="${$.i18n.prop('managedrepository.scan.directories')}">${$.i18n.prop('managedrepository.scan.directories.grid.header')}</th-->
</tr>
</thead>
<tbody>
@@ -187,15 +184,6 @@
<td>
<a href="${row.feedsUrl}"><img src="images/atom.gif" alt=""
title="${$.i18n.prop('managedrepository.feeds')} ${row.name()}"/></a>
</td>
- <!--td>
- {{if row.description()}}
- <a class="btn btn-warning btn-mini popover-doc"
id="managedrepo-description-help"
- data-content="${row.description()}"
data-title="${$.i18n.prop('description')}"
- data-placement="left">
- <i class="icon-question-sign icon-white"></i>
- </a>
- {{/if}}
- </td-->
<td id="managedrepository-stats-${row.id()}">
<img src="images/utilities-system-monitor-22-22.png"
data-original-title="${$.i18n.prop('managedrepository.stats')}"
data-bind="event: { mouseover: function(){ showStats(row)
}, mouseout: function(){ hideStats(row) },}"
