]> source.dussan.org Git - archiva.git/commitdiff
load jquery ui on start
authorOlivier Lamy <olamy@apache.org>
Thu, 23 Aug 2012 16:19:47 +0000 (16:19 +0000)
committerOlivier Lamy <olamy@apache.org>
Thu, 23 Aug 2012 16:19:47 +0000 (16:19 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1376575 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js

index e1c4efb0a69956f59d19350fecc156e811ed33d4..1e31f8a7a359a777fcf8f1f9423b234b5fd1e59e 100644 (file)
@@ -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>
 
index 3baa67acf0f19e6beccf9736eaa8e88be4284493..6127c28b87463d9a884dddcc2a82afbfb7cdc9a6 100644 (file)
@@ -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();
 
   }