From 7dfadd869c910a748fb619a60ef1872f3a623521 Mon Sep 17 00:00:00 2001 From: Andrew Short Date: Sun, 11 Oct 2009 00:06:56 +0000 Subject: [PATCH] BUGFIX #2133: Removed UniqueTextField JavaScript that was causing URLSegments to be incorrectly rewritten if they had a number at the end. From: Andrew Short git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88471 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- javascript/UniqueFields.js | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/javascript/UniqueFields.js b/javascript/UniqueFields.js index 3e9bf2d09..ce2f6c231 100755 --- a/javascript/UniqueFields.js +++ b/javascript/UniqueFields.js @@ -37,15 +37,7 @@ UniqueFormField.prototype = { } } -UniqueTextField = Class.extend('UniqueFormField'); -UniqueTextField.applyTo('input.UniqueTextField'); -UniqueTextField.prototype = { - initialize: function() { - this.onblur = this.validate.bind(this); - } -} - -UniqueRestrictedTextField = Class.extend('UniqueTextField'); +UniqueRestrictedTextField = Class.extend('UniqueFormField'); UniqueRestrictedTextField.applyTo('input.UniqueRestrictedTextField'); UniqueRestrictedTextField.prototype = { initialize: function() { @@ -77,13 +69,8 @@ UniqueRestrictedTextField.prototype = { return escaped; } - var parts = escaped.match( /(.*)(\d+)$/ ); + var prefix = escaped; - if( parts ) - prefix = parts[1]; - else - prefix = escaped; - if( prefix.charAt(prefix.length-1) != this.charReplacement ) prefix = prefix + this.charReplacement;