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/07/10 20:55:19 UTC
svn commit: r1359838 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
main.js search.js
Author: olamy
Date: Tue Jul 10 18:55:18 2012
New Revision: 1359838
URL: http://svn.apache.org/viewvc?rev=1359838&view=rev
Log:
no need to continue the loop when we have found the enries and prevent NPE
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
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=1359838&r1=1359837&r2=1359838&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 Tue Jul 10 18:55:18 2012
@@ -269,6 +269,7 @@ function() {
ko.utils.arrayFirst(self.artifactMenuItems.concat(self.usersMenuItems, self.administrationMenuItems), function(p) {
if ( p.href == "#"+self.activeMenuId()) {
p.func();
+ return;
}
});
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=1359838&r1=1359837&r2=1359838&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 Tue Jul 10 18:55:18 2012
@@ -43,7 +43,9 @@ define("archiva.search",["jquery","i18n"
breadCrumbEntries=function(){
// root level ?
- if (!self.parentBrowseViewModel) return [];
+ if (!self.parentBrowseViewModel){
+ return [];
+ }
return calculateBreadCrumbEntries(self.groupId);
}
@@ -69,6 +71,9 @@ define("archiva.search",["jquery","i18n"
}
calculateBreadCrumbEntries=function(groupId){
+ if (!groupId){
+ return [];
+ }
var splitted = groupId.split(".");
var breadCrumbEntries=[];
var curGroupId="";