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

correctly close popover when mouseout 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1377984 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-08-28 06:31:02 +00:00
parent d897c8bcfa
commit 7998e01615
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,7 +370,7 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
showSettings=function(proxyConnector,targetContentStartId, targetImgStartId,theProxyConnectorsViewModel){ showSettings=function(proxyConnector,targetContentStartId, targetImgStartId,theProxyConnectorsViewModel){
var id = (targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-") var id = (targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-")
+proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId() +proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId()
.replace(/\./g,"\\\."); .replace(/\./g,"\\\.");
@ -383,11 +383,11 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
proxyConnector:ko.toJS(proxyConnector) proxyConnector:ko.toJS(proxyConnector)
} ).html(); } ).html();
targetContent.append(tmplHtml); //targetContent.append(tmplHtml);
var targetImg = $((targetImgStartId?targetImgStartId:"#proxy-connectors-grid-remoterepo-settings-edit-") var targetImg = $((targetImgStartId?targetImgStartId:"#proxy-connectors-grid-remoterepo-settings-edit-")
+proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\.")); +proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\."));
targetImg.attr("data-content",targetContent.html()); targetImg.attr("data-content",tmplHtml);//targetContent.html());
targetImg.popover( targetImg.popover(
{ {
placement: "left", placement: "left",
@ -399,6 +399,14 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
} }
hideSettings=function(proxyConnector){
$.log('hideSettings:'+proxyConnector.sourceRepoId()+","+proxyConnector.targetRepoId());
//var targetImg = $("#proxy-connectors-grid-remoterepo-settings-edit-")
// +proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\.");
$("#body_content" ).find(".popover" ).hide();
//targetImg.attr("data-content",'');//.popover('hide');
}
this.displaySettings=function(sourceRepoId,targetRepoId,targetContentStartId, targetImgStartId){ this.displaySettings=function(sourceRepoId,targetRepoId,targetContentStartId, targetImgStartId){
var proxyConnector=getProxyConnector(sourceRepoId,targetRepoId); var proxyConnector=getProxyConnector(sourceRepoId,targetRepoId);
showSettings(proxyConnector,targetContentStartId,targetImgStartId); showSettings(proxyConnector,targetContentStartId,targetImgStartId);

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

@ -716,9 +716,7 @@
<td> <td>
<img src="images/utilities-system-monitor-22-22.png" id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}" <img src="images/utilities-system-monitor-22-22.png" 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-bind="event: { mouseover: function(){ showSettings(row)},}"> data-bind="event: { mouseover: function(){ showSettings(row)},mouseout: function(){hideSettings(row)},}">
<div id="proxy-connectors-grid-remoterepo-settings-content-${row.sourceRepoId()}-${row.targetRepoId()}"
style="display:none"></div>
</td> </td>
<td> <td>
<a data-bind="click: function(){ editProxyConnector(row)}" href="#"> <a data-bind="click: function(){ editProxyConnector(row)}" href="#">