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

[ol...@apache.org]

Author: olamy
Date: Wed Jul 11 22:03:41 2012
New Revision: 1360440

URL: http://svn.apache.org/viewvc?rev=1360440&view=rev
Log:
default screen to search

Modified:
    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/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=1360440&r1=1360439&r2=1360440&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 Wed Jul 11 22:03:41 2012
@@ -52,26 +52,7 @@ function() {
     });
   }
 
-  // handle url with registration link
-  checkUrlParams=function(){
-    var validateMeId = $.urlParam('validateMe');
-    if (validateMeId) {
-      validateKey(validateMeId);
-      return;
-    }
-    var resetPassword= $.urlParam('resetPassword');
-    if (resetPassword){
-      resetPasswordForm(resetPassword);
-      return;
-    }
-    // by default display search screen
-    $.log("location:"+window.sammyArchivaApplication.getLocation());
-    //window.sammyArchivaApplication.setLocation("#search");
-  }
 
-  hasKarma=function(karmaName){
-    return $.inArray(karmaName,window.redbackModel.operatioNames)>=0;
-  }
 
   decorateMenuWithKarma=function(user) {
     var username = user.username;
@@ -247,7 +228,6 @@ function() {
         });
         //this.get('', function () { this.app.runRoute('get', '#search') });
       });
-      sammyArchivaApplication.run();
   }
 
   userLoggedCallbackFn=function(user){
@@ -292,6 +272,33 @@ function() {
     });
   }
 
+  // handle url with registration link
+  checkUrlParams=function(){
+    var validateMeId = $.urlParam('validateMe');
+    if (validateMeId) {
+      validateKey(validateMeId);
+      return;
+    }
+    var resetPassword= $.urlParam('resetPassword');
+    if (resetPassword){
+      resetPasswordForm(resetPassword);
+      return;
+    }
+
+    var matches = window.location.toString().match(/^[^#]*(#.+)$/);
+    var hash = matches ? matches[1] : '';
+    $.log("location:"+window.sammyArchivaApplication.getLocation()+",hash:"+hash);
+    // by default display search screen
+    if(!hash){
+      window.sammyArchivaApplication.setLocation("#search");
+    }
+
+  }
+
+  hasKarma=function(karmaName){
+    return $.inArray(karmaName,window.redbackModel.operatioNames)>=0;
+  }
+
   startArchivaApplication=function(){
 
     $.log("startArchivaApplication");
@@ -349,6 +356,8 @@ function() {
 						};
     updateAppearanceToolBar();
 
+    window.sammyArchivaApplication.run();
+
   }