svn commit: r1298566 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: main.js network-proxies.js templates/network-proxies.html utils.js

[olamy]

Author: olamy
Date: Thu Mar  8 20:40:10 2012
New Revision: 1298566

URL: http://svn.apache.org/viewvc?rev=1298566&view=rev
Log:
minor cleanup on selector usage

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1298566&r1=1298565&r2=1298566&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
 Thu Mar  8 20:40:10 2012
@@ -82,6 +82,10 @@ $(function() {
     var screen = $.urlParam('screen');
 
     if(screen){
+      if(screen=='network-proxies'&& hasKarma('archiva-manage-configuration')){
+        displayNetworkProxies();
+        return;
+      }
       if(screen=='proxy-connectors'&& 
hasKarma('archiva-manage-configuration')){
         displayProxyConnectors();
         return;

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1298566&r1=1298565&r2=1298566&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
 Thu Mar  8 20:40:10 2012
@@ -270,7 +270,8 @@ $(function() {
   }
 
   activateNetworkProxyFormValidation=function(){
-    var validator = $("#main-content #network-proxy-edit-form").validate({
+    var editForm=$("#main-content #network-proxy-edit-form");
+    var validator = editForm.validate({
       rules: {id: {
        required: true,
        remote: {
@@ -279,7 +280,7 @@ $(function() {
        }
       }},
       showErrors: function(validator, errorMap, errorList) {
-       customShowError("#main-content 
#network-proxy-edit-form",validator,errorMap,errorMap);
+       customShowError(editForm,validator,errorMap,errorMap);
       }
     });
     
validator.settings.messages["id"]=$.i18n.prop("id.required.or.alreadyexists");

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html?rev=1298566&r1=1298565&r2=1298566&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
 Thu Mar  8 20:40:10 2012
@@ -98,7 +98,7 @@
     <form id="network-proxy-edit-form" class="well form-horizontal">
       <fieldset id="network-proxy-edit-fieldset">
         <div class="control-group">
-          <label class="control-label"  for="id">${$.i18n.prop('id')}</label>
+          <label class="control-label" for="id">${$.i18n.prop('id')}</label>
           <div class="controls">
             {{if update}}
               <span class="uneditable-input">${$data.networkProxy.id}</span>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1298566&r1=1298565&r2=1298566&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
 Thu Mar  8 20:40:10 2012
@@ -285,11 +285,11 @@ displayRestError=function(data,idToAppen
  * @param errorList
  */
 customShowError=function(selector, validator, errorMap, errorList) {
-  $.isFunction(selector)? selector.find("div.control-group" ).removeClass( 
"error" ):$(selector).find("div.control-group" ).removeClass( "error" );
-  $.isFunction(selector)? 
selector.find("span.help-inline").remove():$(selector).find("span.help-inline").remove();
+  $(selector).find("div.control-group" ).removeClass( "error" );
+  $(selector).find("span.help-inline").remove();
   for ( var i = 0; errorList[i]; i++ ) {
     var error = errorList[i];
-    var field = $("#"+error.element.id);
+    var field = $(selector).find("#"+error.element.id);// 
$.isFunction(selector)? selector.find(fieldSelector 
).get(0):$(selector).find(selector);
     field.parents( "div.control-group" ).addClass( "error" );
     field.parent().append( "<span class=\"help-inline\">" + error.message + 
"</span>" );
   }