Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-04-12 20:42:06 +00:00
parent c0ec48e2a8
commit 30640f8832
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@
<script type="text/javascript" src="js/jquery-1.7.2.js"></script> <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/require.1.0.7.js"></script>
<script type="text/javascript" src="js/bootstrap.2.0.2.js"></script>
<title>Apache Archiva</title> <title>Apache Archiva</title>
@ -74,9 +73,6 @@
cache: false, cache: false,
success:function(data){ success:function(data){
window.modalLoading=$("#dialog-spinner-modal").modal();
window.modalLoading.modal('show');
window.archivaDevMode=data.devMode; window.archivaDevMode=data.devMode;
window.archivaJavascriptLog=data.javascriptLog; window.archivaJavascriptLog=data.javascriptLog;
window.archivaRuntimeInfo=data; window.archivaRuntimeInfo=data;
@ -139,7 +135,6 @@
require(['order!domReady','archiva/main'],function (domReady) { require(['order!domReady','archiva/main'],function (domReady) {
domReady.withResources(function () { domReady.withResources(function () {
startArchivaApplication(); startArchivaApplication();
window.modalLoading.modal('hide');
}) })
}) })

3
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
View File

@ -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 #proxy-connectors-view-tabs-a-network-proxies-grid").tab('show');
mainContent.find("#proxy-connectors-view-tabs").on('show', function (e) { 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") { if ($(e.target).attr("href")=="#proxy-connectors-edit") {
$.log("#proxy-connectors-edit");
var proxyConnector=new ProxyConnector(); var proxyConnector=new ProxyConnector();
var defaultPolicies=new Array(); var defaultPolicies=new Array();
// populate with defaut policies options // populate with defaut policies options