Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 523C8DCCB for ; Sun, 23 Dec 2012 00:00:41 +0000 (UTC) Received: (qmail 37339 invoked by uid 500); 23 Dec 2012 00:00:41 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 37285 invoked by uid 500); 23 Dec 2012 00:00:41 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 37277 invoked by uid 99); 23 Dec 2012 00:00:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 00:00:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 00:00:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E82312388B34; Sun, 23 Dec 2012 00:00:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1425379 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: general-admin.js utils.js Date: Sun, 23 Dec 2012 00:00:19 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121223000019.E82312388B34@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Sun Dec 23 00:00:19 2012 New Revision: 1425379 URL: http://svn.apache.org/viewvc?rev=1425379&view=rev Log: reuse selector Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js 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/general-admin.js URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1425379&r1=1425378&r2=1425379&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js Sun Dec 23 00:00:19 2012 @@ -1409,12 +1409,13 @@ define("archiva.general-admin",["jquery" } saveRedbackRuntimeConfiguration=function(){ - var valid = $("#main-content").find("#redback-runtime-general-form-id").valid(); + var mainContent=$("#main-content"); + var valid = mainContent.find("#redback-runtime-general-form-id").valid(); if (valid==false) { return; } $.log("saveRedbackRuntimeConfiguration"); - var saveButton = $("#redback-runtime-configuration-save" ); + var saveButton = mainContent.find("#redback-runtime-configuration-save" ); saveButton.button('loading'); clearUserMessages(); var userMessages=$("#user-messages"); @@ -1474,7 +1475,8 @@ define("archiva.general-admin",["jquery" } activateRedbackRuntimeGeneralFormValidation=function(){ - var validator = $("#main-content" ).find("#redback-runtime-general-form-id").validate({ + var formSelector=$("#main-content" ).find("#redback-runtime-general-form-id"); + var validator = formSelector.validate({ rules: { usersCacheTimeToLiveSeconds : { digits: true, @@ -1488,7 +1490,7 @@ define("archiva.general-admin",["jquery" } }, showErrors: function(validator, errorMap, errorList) { - customShowError("#main-content #redback-runtime-general-form-id",validator,errorMap,errorMap); + customShowError(formSelector,validator,errorMap,errorMap); } }); } 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=1425379&r1=1425378&r2=1425379&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 Sun Dec 23 00:00:19 2012 @@ -324,15 +324,25 @@ require(["jquery","jquery.tmpl","i18n"," removeValidationErrorMessages(selector); for ( var i = 0; errorList[i]; i++ ) { var error = errorList[i]; - var field = $(selector).find("#"+error.element.id); + if (typeof selector == 'string') { + var field = $(selector).find("#"+error.element.id); + } else { + var field = selector.find("#"+error.element.id); + } field.parents( "div.control-group" ).addClass( "error" ); field.parent().append( "" + error.message + "" ); } } removeValidationErrorMessages=function(selector){ - $(selector).find("div.control-group" ).removeClass( "error" ); - $(selector).find("span.help-inline").remove(); + if (typeof selector == 'string') { + $(selector).find("div.control-group" ).removeClass( "error" ); + $(selector).find("span.help-inline").remove(); + } else { + selector.find("div.control-group" ).removeClass( "error" ); + selector.find("span.help-inline").remove(); + } + } appendArchivaVersion=function(){