remove bootstrap js load as it break add tab activation on pages

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325499 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
index 5de43b3b6c3cd5d36eb5588ae3ef28e78b6cbe2f..2d8b449f6cb700d912136a2873cada696bfccd10 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
@@ -12,7 +12,6 @@
   <script type="text/javascript" src="js/jquery-1.7.2.js"></script>
 
   <script type="text/javascript" src="js/require.1.0.7.js"></script>
-  <script type="text/javascript" src="js/bootstrap.2.0.2.js"></script>
 
   <title>Apache Archiva</title>
 
@@ -74,9 +73,6 @@
         cache: false,
         success:function(data){
 
-            window.modalLoading=$("#dialog-spinner-modal").modal();
-            window.modalLoading.modal('show');
-
             window.archivaDevMode=data.devMode;
             window.archivaJavascriptLog=data.javascriptLog;
             window.archivaRuntimeInfo=data;
@@ -139,7 +135,6 @@
                               require(['order!domReady','archiva/main'],function (domReady) {
                                   domReady.withResources(function () {
                                       startArchivaApplication();
-                                      window.modalLoading.modal('hide');
                                   })
                               })
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
index e8e05de2b175ba560de47dfc9db8fbdc7d0746b4..5f93d73b2030b80e28ec598d815e565a0ea5057e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
@@ -449,8 +449,9 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
       mainContent.find("#proxy-connectors-view-tabs #proxy-connectors-view-tabs-a-network-proxies-grid").tab('show');
 
       mainContent.find("#proxy-connectors-view-tabs").on('show', function (e) {
-
+        $.log("on show:"+$(e.target).attr("href"));
         if ($(e.target).attr("href")=="#proxy-connectors-edit") {
+          $.log("#proxy-connectors-edit");
           var proxyConnector=new ProxyConnector();
           var defaultPolicies=new Array();
           // populate with defaut policies options