You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/08/28 08:31:02 UTC
svn commit: r1377984 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/proxy-connectors.js templates/archiva/repositories.html
Author: olamy
Date: Tue Aug 28 06:31:02 2012
New Revision: 1377984
URL: http://svn.apache.org/viewvc?rev=1377984&view=rev
Log:
correctly close popover when mouseout
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
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=1377984&r1=1377983&r2=1377984&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 Tue Aug 28 06:31:02 2012
@@ -370,7 +370,7 @@ define("archiva.proxy-connectors",["jque
showSettings=function(proxyConnector,targetContentStartId, targetImgStartId,theProxyConnectorsViewModel){
var id = (targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-")
- +proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId()
+ +proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId()
.replace(/\./g,"\\\.");
@@ -383,11 +383,11 @@ define("archiva.proxy-connectors",["jque
proxyConnector:ko.toJS(proxyConnector)
} ).html();
- targetContent.append(tmplHtml);
+ //targetContent.append(tmplHtml);
var targetImg = $((targetImgStartId?targetImgStartId:"#proxy-connectors-grid-remoterepo-settings-edit-")
- +proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\."));
- targetImg.attr("data-content",targetContent.html());
+ +proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\."));
+ targetImg.attr("data-content",tmplHtml);//targetContent.html());
targetImg.popover(
{
placement: "left",
@@ -399,6 +399,14 @@ define("archiva.proxy-connectors",["jque
}
+ 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){
var proxyConnector=getProxyConnector(sourceRepoId,targetRepoId);
showSettings(proxyConnector,targetContentStartId,targetImgStartId);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1377984&r1=1377983&r2=1377984&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html Tue Aug 28 06:31:02 2012
@@ -716,9 +716,7 @@
<td>
<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-bind="event: { mouseover: function(){ showSettings(row)},}">
- <div id="proxy-connectors-grid-remoterepo-settings-content-${row.sourceRepoId()}-${row.targetRepoId()}"
- style="display:none"></div>
+ data-bind="event: { mouseover: function(){ showSettings(row)},mouseout: function(){hideSettings(row)},}">
</td>
<td>
<a data-bind="click: function(){ editProxyConnector(row)}" href="#">