From 08427521799d4cb3b27fe931596e5e9dab8c411c Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 24 Aug 2012 08:11:38 +0000 Subject: [PATCH] match returns a boolean,start fixing jquery selector git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1376854 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-webapp-js/src/main/webapp/js/archiva/archiva.js | 4 ++-- .../archiva-webapp-js/src/main/webapp/js/archiva/main.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js index 8b0fb49d7..d7745ac10 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js @@ -22,7 +22,7 @@ appendArchivaVersion=function(){ } timestampNoCache=function(){ - if (window.archivaRuntimeInfo.version.match("SNAPSHOT$")=="SNAPSHOT"){ + if (window.archivaRuntimeInfo.version.match("SNAPSHOT$")){ return "&archivaTimestamp="+window.archivaRuntimeInfo.timestamp+(window.archivaRuntimeInfo.devMode?"&_="+jQuery.now():""); } return ""; @@ -107,7 +107,7 @@ $.ajax({ window.archivaJavascriptLog=data.javascriptLog; window.archivaRuntimeInfo=data; - require(['sammy','jquery','jquery.tmpl','archiva.main','utils','domReady!'],function (domReady) { + require(['sammy','jquery','jquery.tmpl','archiva.main','utils','domReady!'],function () { startArchivaApplication(); $("#loadingDiv").hide(); drawQuickSearchAutocomplete(); 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 ed10423fb..855387847 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 @@ -72,7 +72,7 @@ function(jquery,ui,sammy,tmpl) { return item.name(); }); - $("#topbar-menu-container [redback-permissions]").each(function(element){ + $("#topbar-menu-container").find("[redback-permissions]").each(function(element){ checkElementKarma(this); }); $("#sidebar-content [redback-permissions]").each(function(element){ @@ -105,7 +105,7 @@ function(jquery,ui,sammy,tmpl) { $(this).hide(); }); - $("#sidebar-content [redback-permissions]").each(function(element){ + $("#sidebar-content").find("[redback-permissions]").each(function(element){ $(this).hide(); }); $.log("hideElementWithKarma"); -- 2.39.5