Author: olamy
Date: Thu Oct 18 12:17:25 2012
New Revision: 1399604
URL: http://svn.apache.org/viewvc?rev=1399604&view=rev
Log:
possibility to reuse selector with this util method
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1399604&r1=1399603&r2=1399604&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Thu Oct 18 12:17:25 2012
@@ -536,7 +536,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
ko.applyBindings({artifacts:artifacts,gridViewModel:gridViewModel},dependeesContentDiv.get(0));
},
complete: function(){
- removeMediumSpinnerImg(("#artifact-details-used-by-content"));
+ removeMediumSpinnerImg(dependeesContentDiv);
}
});
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1399604&r1=1399603&r2=1399604&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Thu Oct 18 12:17:25 2012
@@ -1859,10 +1859,11 @@ define("archiva.search",["jquery","i18n"
}
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-advanced-search" ).button("loading");
- $("#user-messages").html(mediumSpinnerImg());
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
if (repositoriesIds){
self.selectedRepoIds=repositoriesIds;
} else {
@@ -1911,7 +1912,7 @@ define("archiva.search",["jquery","i18n"
complete:function() {
mainContent.find("#btn-basic-search" ).button("reset");
mainContent.find("#btn-advanced-search" ).button("reset");
- removeMediumSpinnerImg("#user-messages");
+ removeMediumSpinnerImg(userMessages);
}
}
);
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1399604&r1=1399603&r2=1399604&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Thu Oct 18 12:17:25 2012
@@ -206,7 +206,12 @@ require(["jquery","jquery.tmpl","i18n","
}
removeMediumSpinnerImg=function(selector){
- $(selector ).find("#medium-spinner").remove();
+ if (typeof selector == 'string') {
+ $(selector).find("#medium-spinner").remove();
+ } else {
+ selector.find("#medium-spinner").remove();
+ }
+
}
mediumSpinnerImg=function(){
