You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/02 14:38:33 UTC
svn commit: r1308322 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
Author: olamy
Date: Mon Apr 2 12:38:33 2012
New Revision: 1308322
URL: http://svn.apache.org/viewvc?rev=1308322&view=rev
Log:
correctly display spinner when loading network proxies
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1308322&r1=1308321&r2=1308322&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Mon Apr 2 12:38:33 2012
@@ -204,60 +204,59 @@ define("archiva.network-proxies",["jquer
clearUserMessages();
var mainContent = $("#main-content");
mainContent.html(mediumSpinnerImg());
- mainContent.html($("#networkProxiesMain").tmpl());
- mainContent.find("#network-proxies-view-tabs a:first").tab('show');
-
- var networkProxiesViewModel = new NetworkProxiesViewModel();
-
- mainContent.find("#network-proxies-view-tabs").on('show', function (e) {
- if ($(e.target).attr("href")=="#network-proxies-edit") {
- var viewModel = new NetworkProxyViewModel(new NetworkProxy(),false,networkProxiesViewModel);
- ko.applyBindings(viewModel,$("#main-content #network-proxies-edit").get(0));
- activateNetworkProxyFormValidation();
- clearUserMessages();
- }
- if ($(e.target).attr("href")=="#network-proxies-view") {
- $("#main-content #network-proxies-view-tabs-li-edit a").html($.i18n.prop("add"));
- clearUserMessages();
- }
-
- });
loadNetworkProxies( function(data) {
- networkProxiesViewModel.networkProxies(mapNetworkProxies(data));
- networkProxiesViewModel.gridViewModel = new ko.simpleGrid.viewModel({
- data: networkProxiesViewModel.networkProxies,
- columns: [
- {
- headerText: $.i18n.prop('identifier'),
- rowText: "id"
- },
- {
- headerText: $.i18n.prop('protocol'),
- rowText: "protocol"
- },
- {
- headerText: $.i18n.prop('host'),
- rowText: "host"
- },
- {
- headerText: $.i18n.prop('port'),
- rowText: "port"
- },
- {
- headerText: $.i18n.prop('username'),
- rowText: "username"
- }
- ],
- pageSize: 5,
- gridUpdateCallBack: function(networkProxy){
- $("#main-content #networkProxiesTable [title]").tooltip();
+ var networkProxiesViewModel = new NetworkProxiesViewModel();
+ mainContent.html($("#networkProxiesMain").tmpl());
+ mainContent.find("#network-proxies-view-tabs a:first").tab('show');
+
+ mainContent.find("#network-proxies-view-tabs").on('show', function (e) {
+ if ($(e.target).attr("href")=="#network-proxies-edit") {
+ var viewModel = new NetworkProxyViewModel(new NetworkProxy(),false,networkProxiesViewModel);
+ ko.applyBindings(viewModel,$("#main-content #network-proxies-edit").get(0));
+ activateNetworkProxyFormValidation();
+ clearUserMessages();
+ }
+ if ($(e.target).attr("href")=="#network-proxies-view") {
+ $("#main-content #network-proxies-view-tabs-li-edit a").html($.i18n.prop("add"));
+ clearUserMessages();
+ }
+
+ });
+ networkProxiesViewModel.networkProxies(mapNetworkProxies(data));
+ networkProxiesViewModel.gridViewModel = new ko.simpleGrid.viewModel({
+ data: networkProxiesViewModel.networkProxies,
+ columns: [
+ {
+ headerText: $.i18n.prop('identifier'),
+ rowText: "id"
+ },
+ {
+ headerText: $.i18n.prop('protocol'),
+ rowText: "protocol"
+ },
+ {
+ headerText: $.i18n.prop('host'),
+ rowText: "host"
+ },
+ {
+ headerText: $.i18n.prop('port'),
+ rowText: "port"
+ },
+ {
+ headerText: $.i18n.prop('username'),
+ rowText: "username"
}
- });
- ko.applyBindings(networkProxiesViewModel,$("#main-content #network-proxies-view").get(0));
- }
+ ],
+ pageSize: 5,
+ gridUpdateCallBack: function(networkProxy){
+ $("#main-content #networkProxiesTable [title]").tooltip();
+ }
+ });
+ ko.applyBindings(networkProxiesViewModel,$("#main-content #network-proxies-view").get(0));
+ }
)
}