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

possibility to reuse selector with this util method 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1399604 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-10-18 12:17:25 +00:00
parent 677802e378
commit 18a32a9c65
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
View File

@ -536,7 +536,7 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
ko.applyBindings({artifacts:artifacts,gridViewModel:gridViewModel},dependeesContentDiv.get(0)); ko.applyBindings({artifacts:artifacts,gridViewModel:gridViewModel},dependeesContentDiv.get(0));
}, },
complete: function(){ complete: function(){
removeMediumSpinnerImg(("#artifact-details-used-by-content")); removeMediumSpinnerImg(dependeesContentDiv);
} }
}); });

7
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
View File

@ -1859,10 +1859,11 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
} }
this.search=function(url,repositoriesIds){ this.search=function(url,repositoriesIds){
var searchResultsGrid=mainContent.find("#search-results #search-results-grid" ); var searchResultsGrid=mainContent.find("#search-results" ).find("#search-results-grid" );
mainContent.find("#btn-basic-search" ).button("loading"); mainContent.find("#btn-basic-search" ).button("loading");
mainContent.find("#btn-advanced-search" ).button("loading"); mainContent.find("#btn-advanced-search" ).button("loading");
$("#user-messages").html(mediumSpinnerImg()); var userMessages=$("#user-messages");
userMessages.html(mediumSpinnerImg());
if (repositoriesIds){ if (repositoriesIds){
self.selectedRepoIds=repositoriesIds; self.selectedRepoIds=repositoriesIds;
} else { } else {
@ -1911,7 +1912,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
complete:function() { complete:function() {
mainContent.find("#btn-basic-search" ).button("reset"); mainContent.find("#btn-basic-search" ).button("reset");
mainContent.find("#btn-advanced-search" ).button("reset"); mainContent.find("#btn-advanced-search" ).button("reset");
removeMediumSpinnerImg("#user-messages"); removeMediumSpinnerImg(userMessages);
} }
} }
); );

5
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
View File

@ -206,7 +206,12 @@ require(["jquery","jquery.tmpl","i18n","knockout"], function(jquery,jqueryTmpl,i
} }
removeMediumSpinnerImg=function(selector){ removeMediumSpinnerImg=function(selector){
if (typeof selector == 'string') {
$(selector).find("#medium-spinner").remove(); $(selector).find("#medium-spinner").remove();
} else {
selector.find("#medium-spinner").remove();
}
} }
mediumSpinnerImg=function(){ mediumSpinnerImg=function(){