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

[olamy]

Author: olamy
Date: Thu Apr 12 20:42:06 2012
New Revision: 1325499

URL: http://svn.apache.org/viewvc?rev=1325499&view=rev
Log:
remove bootstrap js load as it break add tab activation on pages

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/proxy-connectors.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=1325499&r1=1325498&r2=1325499&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 Apr 12 20:42:06 2012
@@ -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');
                                   })
                               })
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1325499&r1=1325498&r2=1325499&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
 Thu Apr 12 20:42:06 2012
@@ -449,8 +449,9 @@ define("archiva.proxy-connectors",["jque
       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