svn commit: r1376575 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp: index.html js/archiva/main.js

[olamy]

Author: olamy
Date: Thu Aug 23 16:19:47 2012
New Revision: 1376575

URL: http://svn.apache.org/viewvc?rev=1376575&view=rev
Log:
load jquery ui on start

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
    
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/index.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1376575&r1=1376574&r2=1376575&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
 Thu Aug 23 16:19:47 2012
@@ -32,6 +32,7 @@
 
 
   <script type="text/javascript" src="js/jquery-1.8.0.min.js"></script>
+  <script type="text/javascript" 
src="js/jquery-ui-1.8.16.custom.min.js"></script>
   <script type="text/javascript" src="js/sammy.0.7.1.js"></script>
   <script type="text/javascript" data-main="js/archiva/archiva.js" 
src="js/require.2.0.6.js"></script>
 

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=1376575&r1=1376574&r2=1376575&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 Aug 23 16:19:47 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-define("archiva.main",["jquery","sammy","jquery.tmpl","jquery.ui","jquery.cookie","bootstrap","archiva.search",
+define("archiva.main",["jquery","jquery.ui","sammy","jquery.tmpl","jquery.cookie","bootstrap","archiva.search",
          
"jquery.validate","jquery.json","knockout","redback.templates","archiva.templates",
           
"redback.roles","redback","archiva.general-admin","archiva.repositories",
           
"archiva.network-proxies","archiva.proxy-connectors","archiva.repository-groups","archiva.artifacts-management"],
@@ -597,6 +597,10 @@ function($,sammy,tmpl,ui) {
     checkCreateAdminLink();
     
$('#footer-content').html($('#footer-tmpl').tmpl(window.archivaRuntimeInfo));
 
+    updateAppearanceToolBar();
+
+    window.sammyArchivaApplication.run();
+
     $( "#quick-search-autocomplete" ).autocomplete({
       minLength: 3,
       delay: 600,
@@ -626,9 +630,6 @@ function($,sammy,tmpl,ui) {
                                                                .append( "<a>" 
+ item.artifactId + "</a>" )
                                                                .appendTo( ul );
                                                };
-    updateAppearanceToolBar();
-
-    window.sammyArchivaApplication.run();
 
   }