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

correctly close popover 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1378150 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-08-28 14:24:51 +00:00
parent a1dd76ba3d
commit e94432f919
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,15 +367,11 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
var res = ($.isArray(proxyConnectors) && proxyConnectors.length>0) ? proxyConnectors[0]:new ProxyConnector(); var res = ($.isArray(proxyConnectors) && proxyConnectors.length>0) ? proxyConnectors[0]:new ProxyConnector();
return res; return res;
} }
showSettings=function(){
showSettings=function(proxyConnector,targetContentStartId, targetImgStartId,theProxyConnectorsViewModel){
$.log("showSettings"); $.log("showSettings");
}
hideSettings=function(proxyConnector){
$("#body_content" ).find(".popover" ).hide(); $("#body_content" ).find(".popover" ).hide();
//$("#main-content").find("[id^='proxy-connectors-grid-remoterepo-settings-edit-']" ).popover("hide");
} }
buildSettings=function(proxyConnector){ buildSettings=function(proxyConnector){
var tmplHtml = $("#proxy-connectors-remote-settings-popover-tmpl") var tmplHtml = $("#proxy-connectors-remote-settings-popover-tmpl")
.tmpl({ .tmpl({
@ -385,13 +381,6 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
var targetImg = $(("#proxy-connectors-grid-remoterepo-settings-edit-") var targetImg = $(("#proxy-connectors-grid-remoterepo-settings-edit-")
+proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\.")); +proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\."));
//targetImg.popover();
//targetImg.popover('show');
return tmplHtml; return tmplHtml;
} }

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
View File

@ -716,7 +716,7 @@
<td> <td>
<a class="btn btn-info btn-mini" id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}" <a class="btn btn-info btn-mini" id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}"
data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}" data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
data-content="${buildSettings(row)}"> data-content="${buildSettings(row)}" data-bind="click: showSettings">
<i class="icon-question-sign icon-white"></i> <i class="icon-question-sign icon-white"></i>
</a> </a>