Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correctly display spinner when loading network proxies 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308322 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-02 12:38:33 +00:00
parent a3507802bc
commit 77771ec721
1 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
View File

@ -204,11 +204,14 @@ define("archiva.network-proxies",["jquery","i18n","jquery.tmpl","bootstrap","jqu
clearUserMessages(); clearUserMessages();
var mainContent = $("#main-content"); var mainContent = $("#main-content");
mainContent.html(mediumSpinnerImg()); mainContent.html(mediumSpinnerImg());
loadNetworkProxies( function(data) {
var networkProxiesViewModel = new NetworkProxiesViewModel();
mainContent.html($("#networkProxiesMain").tmpl()); mainContent.html($("#networkProxiesMain").tmpl());
mainContent.find("#network-proxies-view-tabs a:first").tab('show'); mainContent.find("#network-proxies-view-tabs a:first").tab('show');
var networkProxiesViewModel = new NetworkProxiesViewModel();
mainContent.find("#network-proxies-view-tabs").on('show', function (e) { mainContent.find("#network-proxies-view-tabs").on('show', function (e) {
if ($(e.target).attr("href")=="#network-proxies-edit") { if ($(e.target).attr("href")=="#network-proxies-edit") {
var viewModel = new NetworkProxyViewModel(new NetworkProxy(),false,networkProxiesViewModel); var viewModel = new NetworkProxyViewModel(new NetworkProxy(),false,networkProxiesViewModel);
@ -222,10 +225,6 @@ define("archiva.network-proxies",["jquery","i18n","jquery.tmpl","bootstrap","jqu
} }
}); });
loadNetworkProxies( function(data) {
networkProxiesViewModel.networkProxies(mapNetworkProxies(data)); networkProxiesViewModel.networkProxies(mapNetworkProxies(data));
networkProxiesViewModel.gridViewModel = new ko.simpleGrid.viewModel({ networkProxiesViewModel.gridViewModel = new ko.simpleGrid.viewModel({
data: networkProxiesViewModel.networkProxies, data: networkProxiesViewModel.networkProxies,