From 28109df4381c2da9f361ef7275eb172bd21d7ff2 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 02:31:44 +0000 Subject: [PATCH] ENHANCEMENT Removed UniqueField.js dependency to CMS-related statusMessage() javascript class, and using jQuery even triggers instead git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92540 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/UniqueTextField.php | 1 + javascript/UniqueFields.js | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/forms/UniqueTextField.php b/forms/UniqueTextField.php index 6a2132db5..523b81c50 100755 --- a/forms/UniqueTextField.php +++ b/forms/UniqueTextField.php @@ -25,6 +25,7 @@ class UniqueTextField extends TextField { function Field() { Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/jquery/jquery.js"); Requirements::javascript(SAPPHIRE_DIR . "/javascript/UniqueFields.js"); /* diff --git a/javascript/UniqueFields.js b/javascript/UniqueFields.js index ce2f6c231..47073e702 100755 --- a/javascript/UniqueFields.js +++ b/javascript/UniqueFields.js @@ -6,12 +6,13 @@ UniqueFormField.prototype = { if( this.restrictedValues[suggested] || suggested == null ) { suggested = this.suggestNewValue(); - statusMessage(ss.i18n.sprintf( + var message = i18n.sprintf( ss.i18n._t('UNIQUEFIELD.SUGGESTED', "Changed value to '%s' : %s"), suggested, this.restrictedMessage - )); - this.value = suggested; + ); + jQuery(this).trigger('validate', {message: message, suggested: suggested}); + this.value = suggested; } }, suggestNewValue: function() { @@ -108,11 +109,13 @@ UniqueRestrictedTextField.prototype = { message = this.charMessage; suggested = this.suggestNewValue(); - statusMessage(ss.i18n.sprintf( + var message = ss.i18n.sprintf( ss.i18n._t('UNIQUEFIELD.SUGGESTED', "Changed value to '%s' : %s"), suggested, message - )); + ); + + jQuery(this).trigger('validate', {message: message, suggested: suggested}); } this.value = suggested;