svn commit: r1378150 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/proxy-connectors.js templates/archiva/repositories.html

[olamy]

Author: olamy
Date: Tue Aug 28 14:24:51 2012
New Revision: 1378150

URL: http://svn.apache.org/viewvc?rev=1378150&view=rev
Log:
correctly close popover

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=1378150&r1=1378149&r2=1378150&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 14:24:51 2012
@@ -367,15 +367,11 @@ define("archiva.proxy-connectors",["jque
       var res = ($.isArray(proxyConnectors) && proxyConnectors.length>0) ? 
proxyConnectors[0]:new ProxyConnector();
       return res;
     }
-
-    showSettings=function(proxyConnector,targetContentStartId, 
targetImgStartId,theProxyConnectorsViewModel){
+    showSettings=function(){
       $.log("showSettings");
-    }
-
-    hideSettings=function(proxyConnector){
       $("#body_content" ).find(".popover" ).hide();
+      
//$("#main-content").find("[id^='proxy-connectors-grid-remoterepo-settings-edit-']"
 ).popover("hide");
     }
-
     buildSettings=function(proxyConnector){
       var tmplHtml = $("#proxy-connectors-remote-settings-popover-tmpl")
                                            .tmpl({
@@ -385,13 +381,6 @@ define("archiva.proxy-connectors",["jque
 
       var targetImg = $(("#proxy-connectors-grid-remoterepo-settings-edit-")
                             
+proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\."));
-
-
-
-      //targetImg.popover();
-
-      //targetImg.popover('show');
-
       return tmplHtml;
     }
 

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=1378150&r1=1378149&r2=1378150&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 14:24:51 2012
@@ -716,7 +716,7 @@
       <td>
           <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-content="${buildSettings(row)}">
+                  data-content="${buildSettings(row)}" data-bind="click: 
showSettings">
               <i class="icon-question-sign icon-white"></i>
           </a>