svn commit: r1376854 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: archiva.js main.js

[olamy]

Author: olamy
Date: Fri Aug 24 08:11:38 2012
New Revision: 1376854

URL: http://svn.apache.org/viewvc?rev=1376854&view=rev
Log:
match returns a boolean,start fixing jquery selector

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js?rev=1376854&r1=1376853&r2=1376854&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
 Fri Aug 24 08:11:38 2012
@@ -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();

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=1376854&r1=1376853&r2=1376854&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
 Fri Aug 24 08:11:38 2012
@@ -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");