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

prevent tooltip not removed 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1306803 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-03-29 12:16:14 +00:00
parent 8d5f87a4c7
commit f432069ad6
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
//private String proxyId; //private String proxyId;
this.proxyId=ko.observable(proxyId); this.proxyId=ko.observable(proxyId);
this.proxyId.subscribe(function(newValue){ this.proxyId.subscribe(function(newValue){
$.log("proxyId modified");
self.modified(true); self.modified(true);
}); });
@ -78,23 +79,19 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
}); });
this.modified=ko.observable(false); this.modified=ko.observable(false);
//this.modified.subscribe(function(newValue){$.log("ProxyConnector modified:"+newValue)});
this.updatePolicyEntry=function(key,value){ this.updatePolicyEntry=function(key,value){
$.log("updatePolicyEntry:"+key+":"+value); $.log("updatePolicyEntry:"+key+":"+value);
var found=false; var found=false;
for(var i=0;i<self.policiesEntries().length;i++){ for(var i=0;i<self.policiesEntries().length;i++){
$.log('loop policiesEntries:'+self.policiesEntries()[i].key);
if (self.policiesEntries()[i].key==key){ if (self.policiesEntries()[i].key==key){
self.policiesEntries()[i].value=value; self.policiesEntries()[i].value=value;
$.log("really updatedPolicyEntry:"+key+":"+self.policiesEntries()[i].value)
found=true; found=true;
self.modified(true); self.modified(true);
} }
} }
if(!found){ if(!found){
self.policiesEntries().push(new Entry(key,value)); self.policiesEntries().push(new Entry(key,value));
$.log("added updatedPolicyEntry:"+key+":"+self.policiesEntries()[i].value());
} }
} }
@ -284,7 +281,6 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
this.remoteRepositories=ko.observableArray([]); this.remoteRepositories=ko.observableArray([]);
this.networkProxies=ko.observableArray([]); this.networkProxies=ko.observableArray([]);
this.bulkSave=function(){ this.bulkSave=function(){
return getModifiedProxyConnectors().length>0; return getModifiedProxyConnectors().length>0;
} }
@ -437,7 +433,7 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
data: self.proxyConnectors, data: self.proxyConnectors,
pageSize: 5, pageSize: 5,
gridUpdateCallBack: function(){ gridUpdateCallBack: function(){
$("#main-content #proxyConnectorsTable [title]").tooltip(); //$("#main-content #proxyConnectorsTable [title]").tooltip();
} }
}); });
var mainContent = $("#main-content"); var mainContent = $("#main-content");

7
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/proxy-connectors.html
View File

@ -172,10 +172,9 @@
<tr> <tr>
<td data-bind="text: name"></td> <td data-bind="text: name"></td>
<td> <td>
<select <select data-bind="options: getPolicyOptions(id()),value:getSelectedPolicyOption(id()),
data-bind="options: getPolicyOptions(id()),value:getSelectedPolicyOption(id()), attr: { id: 'policy-'+id() },event: { change: function(){ changePolicyOption(id())},}">
attr: { id: 'policy-'+id() },event: { change: function(){ changePolicyOption(id())},}" </select>
></select>
</td> </td>
</tr> </tr>
</tbody> </tbody>