From 677802e378fbbb4787e89d41d9388689a9503c63 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 18 Oct 2012 12:17:12 +0000 Subject: [PATCH] reuse selectors git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1399603 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/main.js | 64 +++++++++---------- .../webapp/js/templates/archiva/search.html | 1 - 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index 0085b1bcc..72eb6b69d 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -507,39 +507,39 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa var calculateUsedBy=function(groupId,artifactId,version){ var dependeesContentDiv=$("#main-content" ).find("#artifact-details-used-by-content" ); - //if( $.trim(dependeesContentDiv.html()).length<1){ - dependeesContentDiv.append(mediumSpinnerImg()); - var dependeesUrl="restServices/archivaServices/browseService/dependees/"+encodeURIComponent(groupId); - dependeesUrl+="/"+encodeURIComponent(artifactId); - dependeesUrl+="/"+encodeURIComponent(version); - var selectedRepo=getSelectedBrowsingRepository(); - if (selectedRepo){ - dependeesUrl+="?repositoryId="+encodeURIComponent(selectedRepo); + var dependeesTable=dependeesContentDiv.find("#artifact-usedby-table"); + + dependeesContentDiv.append(mediumSpinnerImg()); + var dependeesUrl="restServices/archivaServices/browseService/dependees/"+encodeURIComponent(groupId); + dependeesUrl+="/"+encodeURIComponent(artifactId); + dependeesUrl+="/"+encodeURIComponent(version); + var selectedRepo=getSelectedBrowsingRepository(); + if (selectedRepo){ + dependeesUrl+="?repositoryId="+encodeURIComponent(selectedRepo); + } + $.ajax(dependeesUrl, { + type: "GET", + dataType: 'json', + success: function(data) { + var artifacts=mapArtifacts(data); + var gridViewModel = new ko.simpleGrid.viewModel({ + data: artifacts, + columns: [], + pageSize: 7, + gridUpdateCallBack: function(){ + // no op + } + }); + $.log("artifacts:"+artifacts.length); + dependeesTable.attr("data-bind", + "simpleGrid: gridViewModel,simpleGridTemplate:'dependees_tmpl',pageLinksId:'usedbyPagination',data:'artifacts'"); + ko.applyBindings({artifacts:artifacts,gridViewModel:gridViewModel},dependeesContentDiv.get(0)); + }, + complete: function(){ + removeMediumSpinnerImg(("#artifact-details-used-by-content")); } - $.ajax(dependeesUrl, { - type: "GET", - dataType: 'json', - success: function(data) { - var artifacts=mapArtifacts(data); - //dependeesContentDiv.html($("#dependees_tmpl").tmpl({artifacts: artifacts})); - var gridViewModel = new ko.simpleGrid.viewModel({ - data: artifacts, - columns: [], - pageSize: 7, - gridUpdateCallBack: function(){ - // no op - } - }); - $.log("artifacts:"+artifacts.length); - dependeesContentDiv.find("#artifact-usedby-table").attr("data-bind", - "simpleGrid: gridViewModel,simpleGridTemplate:'dependees_tmpl',pageLinksId:'usedbyPagination',data:'artifacts'"); - ko.applyBindings({artifacts:artifacts,gridViewModel:gridViewModel},dependeesContentDiv.get(0)); - }, - complete: function(){ - removeMediumSpinnerImg(("#artifact-details-used-by-content")); - } - }); - //} + }); + }; this.get('#artifact-used-by/:groupId/:artifactId/:version',function(context){ diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html index 076d8ca60..a0f4a9640 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html @@ -775,7 +775,6 @@